Commit ba290ab7 authored by Len Brown's avatar Len Brown

Pull kmalloc into release branch

parents 9262e914 02438d87
...@@ -50,7 +50,7 @@ static acpi_status hp_ccsr_locate(acpi_handle obj, u64 *base, u64 *length) ...@@ -50,7 +50,7 @@ static acpi_status hp_ccsr_locate(acpi_handle obj, u64 *base, u64 *length)
memcpy(length, vendor->byte_data + 8, sizeof(*length)); memcpy(length, vendor->byte_data + 8, sizeof(*length));
exit: exit:
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
return status; return status;
} }
......
...@@ -856,7 +856,7 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu) ...@@ -856,7 +856,7 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
obj = buffer.pointer; obj = buffer.pointer;
if (obj->type != ACPI_TYPE_BUFFER || if (obj->type != ACPI_TYPE_BUFFER ||
obj->buffer.length < sizeof(*lsapic)) { obj->buffer.length < sizeof(*lsapic)) {
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
return -EINVAL; return -EINVAL;
} }
...@@ -864,13 +864,13 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu) ...@@ -864,13 +864,13 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
if ((lsapic->header.type != ACPI_MADT_LSAPIC) || if ((lsapic->header.type != ACPI_MADT_LSAPIC) ||
(!lsapic->flags.enabled)) { (!lsapic->flags.enabled)) {
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
return -EINVAL; return -EINVAL;
} }
physid = ((lsapic->id << 8) | (lsapic->eid)); physid = ((lsapic->id << 8) | (lsapic->eid));
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
buffer.length = ACPI_ALLOCATE_BUFFER; buffer.length = ACPI_ALLOCATE_BUFFER;
buffer.pointer = NULL; buffer.pointer = NULL;
...@@ -934,20 +934,20 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret) ...@@ -934,20 +934,20 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret)
obj = buffer.pointer; obj = buffer.pointer;
if (obj->type != ACPI_TYPE_BUFFER || if (obj->type != ACPI_TYPE_BUFFER ||
obj->buffer.length < sizeof(*iosapic)) { obj->buffer.length < sizeof(*iosapic)) {
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
return AE_OK; return AE_OK;
} }
iosapic = (struct acpi_table_iosapic *)obj->buffer.pointer; iosapic = (struct acpi_table_iosapic *)obj->buffer.pointer;
if (iosapic->header.type != ACPI_MADT_IOSAPIC) { if (iosapic->header.type != ACPI_MADT_IOSAPIC) {
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
return AE_OK; return AE_OK;
} }
gsi_base = iosapic->global_irq_base; gsi_base = iosapic->global_irq_base;
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
/* /*
* OK, it's an IOSAPIC MADT entry, look for a _PXM value to tell * OK, it's an IOSAPIC MADT entry, look for a _PXM value to tell
......
...@@ -466,7 +466,7 @@ static acpi_status is_memory_device(acpi_handle handle) ...@@ -466,7 +466,7 @@ static acpi_status is_memory_device(acpi_handle handle)
info = buffer.pointer; info = buffer.pointer;
if (!(info->valid & ACPI_VALID_HID)) { if (!(info->valid & ACPI_VALID_HID)) {
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
return AE_ERROR; return AE_ERROR;
} }
...@@ -475,7 +475,7 @@ static acpi_status is_memory_device(acpi_handle handle) ...@@ -475,7 +475,7 @@ static acpi_status is_memory_device(acpi_handle handle)
(strcmp(hardware_id, ACPI_MEMORY_DEVICE_HID))) (strcmp(hardware_id, ACPI_MEMORY_DEVICE_HID)))
status = AE_ERROR; status = AE_ERROR;
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
return status; return status;
} }
......
...@@ -1017,7 +1017,7 @@ static int asus_hotk_get_info(void) ...@@ -1017,7 +1017,7 @@ static int asus_hotk_get_info(void)
} }
hotk->methods = &model_conf[hotk->model]; hotk->methods = &model_conf[hotk->model];
acpi_os_free(model); kfree(model);
return AE_OK; return AE_OK;
} }
...@@ -1096,7 +1096,7 @@ static int asus_hotk_get_info(void) ...@@ -1096,7 +1096,7 @@ static int asus_hotk_get_info(void)
/* S1300A reports L84F, but L1400B too, account for that */ /* S1300A reports L84F, but L1400B too, account for that */
} }
acpi_os_free(model); kfree(model);
return AE_OK; return AE_OK;
} }
...@@ -1256,7 +1256,7 @@ static void __exit asus_acpi_exit(void) ...@@ -1256,7 +1256,7 @@ static void __exit asus_acpi_exit(void)
acpi_bus_unregister_driver(&asus_hotk_driver); acpi_bus_unregister_driver(&asus_hotk_driver);
remove_proc_entry(PROC_ASUS, acpi_root_dir); remove_proc_entry(PROC_ASUS, acpi_root_dir);
acpi_os_free(asus_info); kfree(asus_info);
return; return;
} }
......
...@@ -171,7 +171,7 @@ acpi_battery_get_info(struct acpi_battery *battery, ...@@ -171,7 +171,7 @@ acpi_battery_get_info(struct acpi_battery *battery,
} }
end: end:
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
if (!result) if (!result)
(*bif) = (struct acpi_battery_info *)data.pointer; (*bif) = (struct acpi_battery_info *)data.pointer;
...@@ -231,7 +231,7 @@ acpi_battery_get_status(struct acpi_battery *battery, ...@@ -231,7 +231,7 @@ acpi_battery_get_status(struct acpi_battery *battery,
} }
end: end:
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
if (!result) if (!result)
(*bst) = (struct acpi_battery_status *)data.pointer; (*bst) = (struct acpi_battery_status *)data.pointer;
......
...@@ -236,7 +236,7 @@ container_walk_namespace_cb(acpi_handle handle, ...@@ -236,7 +236,7 @@ container_walk_namespace_cb(acpi_handle handle,
} }
end: end:
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
return AE_OK; return AE_OK;
} }
......
...@@ -152,7 +152,7 @@ static int get_root_bridge_busnr(acpi_handle handle) ...@@ -152,7 +152,7 @@ static int get_root_bridge_busnr(acpi_handle handle)
bbn = bus; bbn = bus;
} }
exit: exit:
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
return (int)bbn; return (int)bbn;
} }
...@@ -192,7 +192,7 @@ find_pci_rootbridge(acpi_handle handle, u32 lvl, void *context, void **rv) ...@@ -192,7 +192,7 @@ find_pci_rootbridge(acpi_handle handle, u32 lvl, void *context, void **rv)
find->handle = handle; find->handle = handle;
status = AE_OK; status = AE_OK;
exit: exit:
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
return status; return status;
} }
...@@ -224,7 +224,7 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv) ...@@ -224,7 +224,7 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv)
info = buffer.pointer; info = buffer.pointer;
if (info->address == find->address) if (info->address == find->address)
find->handle = handle; find->handle = handle;
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
} }
return AE_OK; return AE_OK;
} }
...@@ -330,7 +330,7 @@ static int acpi_platform_notify(struct device *dev) ...@@ -330,7 +330,7 @@ static int acpi_platform_notify(struct device *dev)
acpi_get_name(dev->firmware_data, ACPI_FULL_PATHNAME, &buffer); acpi_get_name(dev->firmware_data, ACPI_FULL_PATHNAME, &buffer);
DBG("Device %s -> %s\n", dev->bus_id, (char *)buffer.pointer); DBG("Device %s -> %s\n", dev->bus_id, (char *)buffer.pointer);
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
} else } else
DBG("Device %s -> No ACPI support\n", dev->bus_id); DBG("Device %s -> No ACPI support\n", dev->bus_id);
#endif #endif
......
...@@ -133,7 +133,7 @@ acpi_evaluate_object_typed(acpi_handle handle, ...@@ -133,7 +133,7 @@ acpi_evaluate_object_typed(acpi_handle handle,
/* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */ /* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */
acpi_os_free(return_buffer->pointer); ACPI_FREE(return_buffer->pointer);
return_buffer->pointer = NULL; return_buffer->pointer = NULL;
} }
......
...@@ -146,13 +146,6 @@ void *acpi_os_allocate(acpi_size size) ...@@ -146,13 +146,6 @@ void *acpi_os_allocate(acpi_size size)
return kmalloc(size, GFP_KERNEL); return kmalloc(size, GFP_KERNEL);
} }
void acpi_os_free(void *ptr)
{
kfree(ptr);
}
EXPORT_SYMBOL(acpi_os_free);
acpi_status acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr) acpi_status acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr)
{ {
if (efi_enabled) { if (efi_enabled) {
...@@ -742,7 +735,7 @@ acpi_status acpi_os_delete_semaphore(acpi_handle handle) ...@@ -742,7 +735,7 @@ acpi_status acpi_os_delete_semaphore(acpi_handle handle)
ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Deleting semaphore[%p].\n", handle)); ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Deleting semaphore[%p].\n", handle));
acpi_os_free(sem); kfree(sem);
sem = NULL; sem = NULL;
return AE_OK; return AE_OK;
......
...@@ -768,7 +768,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr) ...@@ -768,7 +768,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
status = -EFAULT; status = -EFAULT;
end: end:
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
return status; return status;
} }
......
...@@ -216,7 +216,7 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr) ...@@ -216,7 +216,7 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr)
sizeof(struct acpi_pct_register)); sizeof(struct acpi_pct_register));
end: end:
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
return result; return result;
} }
...@@ -294,7 +294,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr) ...@@ -294,7 +294,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
} }
end: end:
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
return result; return result;
} }
...@@ -592,7 +592,7 @@ static int acpi_processor_get_psd(struct acpi_processor *pr) ...@@ -592,7 +592,7 @@ static int acpi_processor_get_psd(struct acpi_processor *pr)
} }
end: end:
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
return result; return result;
} }
......
...@@ -319,7 +319,7 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device) ...@@ -319,7 +319,7 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
goto end; goto end;
} }
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
device->wakeup.flags.valid = 1; device->wakeup.flags.valid = 1;
/* Power button, Lid switch always enable wakeup */ /* Power button, Lid switch always enable wakeup */
...@@ -854,7 +854,7 @@ static void acpi_device_set_id(struct acpi_device *device, ...@@ -854,7 +854,7 @@ static void acpi_device_set_id(struct acpi_device *device,
printk(KERN_ERR "Memory allocation error\n"); printk(KERN_ERR "Memory allocation error\n");
} }
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
} }
static int acpi_device_set_context(struct acpi_device *device, int type) static int acpi_device_set_context(struct acpi_device *device, int type)
......
...@@ -86,7 +86,7 @@ acpi_system_read_dsdt(struct file *file, ...@@ -86,7 +86,7 @@ acpi_system_read_dsdt(struct file *file,
res = simple_read_from_buffer(buffer, count, ppos, res = simple_read_from_buffer(buffer, count, ppos,
dsdt.pointer, dsdt.length); dsdt.pointer, dsdt.length);
acpi_os_free(dsdt.pointer); kfree(dsdt.pointer);
return res; return res;
} }
...@@ -113,7 +113,7 @@ acpi_system_read_fadt(struct file *file, ...@@ -113,7 +113,7 @@ acpi_system_read_fadt(struct file *file,
res = simple_read_from_buffer(buffer, count, ppos, res = simple_read_from_buffer(buffer, count, ppos,
fadt.pointer, fadt.length); fadt.pointer, fadt.length);
acpi_os_free(fadt.pointer); kfree(fadt.pointer);
return res; return res;
} }
......
...@@ -166,10 +166,10 @@ acpi_status acpi_ut_delete_caches(void) ...@@ -166,10 +166,10 @@ acpi_status acpi_ut_delete_caches(void)
/* Free memory lists */ /* Free memory lists */
acpi_os_free(acpi_gbl_global_list); ACPI_FREE(acpi_gbl_global_list);
acpi_gbl_global_list = NULL; acpi_gbl_global_list = NULL;
acpi_os_free(acpi_gbl_ns_node_list); ACPI_FREE(acpi_gbl_ns_node_list);
acpi_gbl_ns_node_list = NULL; acpi_gbl_ns_node_list = NULL;
#endif #endif
......
...@@ -162,7 +162,7 @@ acpi_status acpi_os_delete_cache(struct acpi_memory_list * cache) ...@@ -162,7 +162,7 @@ acpi_status acpi_os_delete_cache(struct acpi_memory_list * cache)
/* Now we can delete the cache object */ /* Now we can delete the cache object */
acpi_os_free(cache); ACPI_FREE(cache);
return (AE_OK); return (AE_OK);
} }
......
...@@ -332,7 +332,7 @@ acpi_evaluate_string(acpi_handle handle, ...@@ -332,7 +332,7 @@ acpi_evaluate_string(acpi_handle handle,
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%s]\n", *data)); ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%s]\n", *data));
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
return AE_OK; return AE_OK;
} }
...@@ -418,7 +418,7 @@ acpi_evaluate_reference(acpi_handle handle, ...@@ -418,7 +418,7 @@ acpi_evaluate_reference(acpi_handle handle,
//kfree(list->handles); //kfree(list->handles);
} }
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
return status; return status;
} }
......
...@@ -1450,7 +1450,7 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video) ...@@ -1450,7 +1450,7 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
video->attached_array = active_device_list; video->attached_array = active_device_list;
video->attached_count = count; video->attached_count = count;
out: out:
acpi_os_free(buffer.pointer); kfree(buffer.pointer);
return status; return status;
} }
......
...@@ -726,7 +726,7 @@ ...@@ -726,7 +726,7 @@
#define ACPI_ALLOCATE(a) acpi_ut_allocate((acpi_size)(a),_COMPONENT,_acpi_module_name,__LINE__) #define ACPI_ALLOCATE(a) acpi_ut_allocate((acpi_size)(a),_COMPONENT,_acpi_module_name,__LINE__)
#define ACPI_ALLOCATE_ZEROED(a) acpi_ut_allocate_zeroed((acpi_size)(a), _COMPONENT,_acpi_module_name,__LINE__) #define ACPI_ALLOCATE_ZEROED(a) acpi_ut_allocate_zeroed((acpi_size)(a), _COMPONENT,_acpi_module_name,__LINE__)
#define ACPI_FREE(a) acpi_os_free(a) #define ACPI_FREE(a) kfree(a)
#define ACPI_MEM_TRACKING(a) #define ACPI_MEM_TRACKING(a)
#else #else
......
...@@ -143,8 +143,6 @@ void acpi_os_release_mutex(acpi_mutex handle); ...@@ -143,8 +143,6 @@ void acpi_os_release_mutex(acpi_mutex handle);
*/ */
void *acpi_os_allocate(acpi_size size); void *acpi_os_allocate(acpi_size size);
void acpi_os_free(void *memory);
acpi_status acpi_status
acpi_os_map_memory(acpi_physical_address physical_address, acpi_os_map_memory(acpi_physical_address physical_address,
acpi_size size, void __iomem ** logical_address); acpi_size size, void __iomem ** logical_address);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment