Pull acpi_os_free into release branch

19 files changed, 36 insertions, 45 deletions

diff --git a/arch/ia64/kernel/acpi-ext.c b/arch/ia64/kernel/acpi-ext.c
index 2a1ef742e223..b7515bc808a8 100644
--- a/arch/ia64/kernel/acpi-ext.c
+++ b/arch/ia64/kernel/acpi-ext.c
@@ -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));
 
   exit:
-        acpi_os_free(buffer.pointer);
+        kfree(buffer.pointer);
         return status;
 }
 
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index ccdef199d915..99761b81db44 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -856,7 +856,7 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
         obj = buffer.pointer;
         if (obj->type != ACPI_TYPE_BUFFER ||
             obj->buffer.length < sizeof(*lsapic)) {
-                acpi_os_free(buffer.pointer);
+                kfree(buffer.pointer);
                 return -EINVAL;
         }
 
@@ -864,13 +864,13 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
 
         if ((lsapic->header.type != ACPI_MADT_LSAPIC) ||
             (!lsapic->flags.enabled)) {
-                acpi_os_free(buffer.pointer);
+                kfree(buffer.pointer);
                 return -EINVAL;
         }
 
         physid = ((lsapic->id << 8) | (lsapic->eid));
 
-        acpi_os_free(buffer.pointer);
+        kfree(buffer.pointer);
         buffer.length = ACPI_ALLOCATE_BUFFER;
         buffer.pointer = NULL;
 
@@ -934,20 +934,20 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret)
         obj = buffer.pointer;
         if (obj->type != ACPI_TYPE_BUFFER ||
             obj->buffer.length < sizeof(*iosapic)) {
-                acpi_os_free(buffer.pointer);
+                kfree(buffer.pointer);
                 return AE_OK;
         }
 
         iosapic = (struct acpi_table_iosapic *)obj->buffer.pointer;
 
         if (iosapic->header.type != ACPI_MADT_IOSAPIC) {
-                acpi_os_free(buffer.pointer);
+                kfree(buffer.pointer);
                 return AE_OK;
         }
 
         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
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index cd57372a6729..84a68965c11a 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -466,7 +466,7 @@ static acpi_status is_memory_device(acpi_handle handle)
 
         info = buffer.pointer;
         if (!(info->valid & ACPI_VALID_HID)) {
-                acpi_os_free(buffer.pointer);
+                kfree(buffer.pointer);
                 return AE_ERROR;
         }
 
@@ -475,7 +475,7 @@ static acpi_status is_memory_device(acpi_handle handle)
             (strcmp(hardware_id, ACPI_MEMORY_DEVICE_HID)))
                 status = AE_ERROR;
 
-        acpi_os_free(buffer.pointer);
+        kfree(buffer.pointer);
         return status;
 }
 
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index 055cfd5c8766..eb0b8fb837c6 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -1017,7 +1017,7 @@ static int asus_hotk_get_info(void)
                 }
                 hotk->methods = &model_conf[hotk->model];
                 
-                acpi_os_free(model);
+                kfree(model);
 
                 return AE_OK;
         }
@@ -1096,7 +1096,7 @@ static int asus_hotk_get_info(void)
                 /* S1300A reports L84F, but L1400B too, account for that */
         }
 
-        acpi_os_free(model);
+        kfree(model);
 
         return AE_OK;
 }
@@ -1256,7 +1256,7 @@ static void __exit asus_acpi_exit(void)
         acpi_bus_unregister_driver(&asus_hotk_driver);
         remove_proc_entry(PROC_ASUS, acpi_root_dir);
 
-        acpi_os_free(asus_info);
+        kfree(asus_info);
 
         return;
 }
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 00b0728efe82..7d92f73b265f 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -171,7 +171,7 @@ acpi_battery_get_info(struct acpi_battery *battery,
         }
 
       end:
-        acpi_os_free(buffer.pointer);
+        kfree(buffer.pointer);
 
         if (!result)
                 (*bif) = (struct acpi_battery_info *)data.pointer;
@@ -231,7 +231,7 @@ acpi_battery_get_status(struct acpi_battery *battery,
         }
 
       end:
-        acpi_os_free(buffer.pointer);
+        kfree(buffer.pointer);
 
         if (!result)
                 (*bst) = (struct acpi_battery_status *)data.pointer;
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 7f7e41d40a3b..871aa520ece7 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -236,7 +236,7 @@ container_walk_namespace_cb(acpi_handle handle,
         }
 
       end:
-        acpi_os_free(buffer.pointer);
+        kfree(buffer.pointer);
 
         return AE_OK;
 }
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 8daef57b994c..10f160dc75b1 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -152,7 +152,7 @@ static int get_root_bridge_busnr(acpi_handle handle)
                 bbn = bus;
         }
       exit:
-        acpi_os_free(buffer.pointer);
+        kfree(buffer.pointer);
         return (int)bbn;
 }
 
@@ -192,7 +192,7 @@ find_pci_rootbridge(acpi_handle handle, u32 lvl, void *context, void **rv)
                 find->handle = handle;
         status = AE_OK;
       exit:
-        acpi_os_free(buffer.pointer);
+        kfree(buffer.pointer);
         return status;
 }
 
@@ -224,7 +224,7 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv)
                 info = buffer.pointer;
                 if (info->address == find->address)
                         find->handle = handle;
-                acpi_os_free(buffer.pointer);
+                kfree(buffer.pointer);
         }
         return AE_OK;
 }
@@ -330,7 +330,7 @@ static int acpi_platform_notify(struct device *dev)
 
                 acpi_get_name(dev->firmware_data, ACPI_FULL_PATHNAME, &buffer);
                 DBG("Device %s -> %s\n", dev->bus_id, (char *)buffer.pointer);
-                acpi_os_free(buffer.pointer);
+                kfree(buffer.pointer);
         } else
                 DBG("Device %s -> No ACPI support\n", dev->bus_id);
 #endif
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index 6d9bd45af30a..dca6799ac678 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -133,7 +133,7 @@ acpi_evaluate_object_typed(acpi_handle handle,
 
                 /* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */
 
-                acpi_os_free(return_buffer->pointer);
+                ACPI_FREE(return_buffer->pointer);
                 return_buffer->pointer = NULL;
         }
 
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 5dd2ed11a387..d4bd314d60ba 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -146,13 +146,6 @@ void *acpi_os_allocate(acpi_size size)
                 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)
 {
         if (efi_enabled) {
@@ -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_os_free(sem);
+        kfree(sem);
         sem = NULL;
 
         return AE_OK;
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index e439eb77d283..8e9c26aae8fe 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -768,7 +768,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                 status = -EFAULT;
 
       end:
-        acpi_os_free(buffer.pointer);
+        kfree(buffer.pointer);
 
         return status;
 }
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 14a00e5a8f6a..7ba5e49ab302 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -216,7 +216,7 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr)
                sizeof(struct acpi_pct_register));
 
       end:
-        acpi_os_free(buffer.pointer);
+        kfree(buffer.pointer);
 
         return result;
 }
@@ -294,7 +294,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
         }
 
       end:
-        acpi_os_free(buffer.pointer);
+        kfree(buffer.pointer);
 
         return result;
 }
@@ -592,7 +592,7 @@ static int acpi_processor_get_psd(struct acpi_processor	*pr)
         }
 
 end:
-        acpi_os_free(buffer.pointer);
+        kfree(buffer.pointer);
         return result;
 }
 
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 861ac378ce42..5fcb50c7b778 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -319,7 +319,7 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
                 goto end;
         }
 
-        acpi_os_free(buffer.pointer);
+        kfree(buffer.pointer);
 
         device->wakeup.flags.valid = 1;
         /* Power button, Lid switch always enable wakeup */
@@ -854,7 +854,7 @@ static void acpi_device_set_id(struct acpi_device *device,
                         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)
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index c90bd2f70b3f..c3bb7faad75e 100644
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -86,7 +86,7 @@ acpi_system_read_dsdt(struct file *file,
 
         res = simple_read_from_buffer(buffer, count, ppos,
                                       dsdt.pointer, dsdt.length);
-        acpi_os_free(dsdt.pointer);
+        kfree(dsdt.pointer);
 
         return res;
 }
@@ -113,7 +113,7 @@ acpi_system_read_fadt(struct file *file,
 
         res = simple_read_from_buffer(buffer, count, ppos,
                                       fadt.pointer, fadt.length);
-        acpi_os_free(fadt.pointer);
+        kfree(fadt.pointer);
 
         return res;
 }
diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c
index 7940fc1bd69e..5cff17dc78b3 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/utilities/utalloc.c
@@ -166,10 +166,10 @@ acpi_status acpi_ut_delete_caches(void)
 
         /* Free memory lists */
 
-        acpi_os_free(acpi_gbl_global_list);
+        ACPI_FREE(acpi_gbl_global_list);
         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;
 #endif
 
diff --git a/drivers/acpi/utilities/utcache.c b/drivers/acpi/utilities/utcache.c
index 56270a30718a..1a1f8109159c 100644
--- a/drivers/acpi/utilities/utcache.c
+++ b/drivers/acpi/utilities/utcache.c
@@ -162,7 +162,7 @@ acpi_status acpi_os_delete_cache(struct acpi_memory_list * cache)
 
         /* Now we can delete the cache object */
 
-        acpi_os_free(cache);
+        ACPI_FREE(cache);
         return (AE_OK);
 }
 
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 1930e1a75b22..f48227f4c8c9 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -332,7 +332,7 @@ acpi_evaluate_string(acpi_handle handle,
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%s]\n", *data));
 
-        acpi_os_free(buffer.pointer);
+        kfree(buffer.pointer);
 
         return AE_OK;
 }
@@ -418,7 +418,7 @@ acpi_evaluate_reference(acpi_handle handle,
                 //kfree(list->handles);
         }
 
-        acpi_os_free(buffer.pointer);
+        kfree(buffer.pointer);
 
         return status;
 }
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 9feb633087a9..1f3ffb353299 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1450,7 +1450,7 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
         video->attached_array = active_device_list;
         video->attached_count = count;
       out:
-        acpi_os_free(buffer.pointer);
+        kfree(buffer.pointer);
         return status;
 }
 
diff --git a/include/acpi/acmacros.h b/include/acpi/acmacros.h
index 4bb38068f40d..f1ac6109556e 100644
--- a/include/acpi/acmacros.h
+++ b/include/acpi/acmacros.h
@@ -726,7 +726,7 @@
 
 #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_FREE(a)                acpi_os_free(a)
+#define ACPI_FREE(a)                kfree(a)
 #define ACPI_MEM_TRACKING(a)
 
 #else
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 89bc4a16c2e8..0cd63bce0ae4 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -143,8 +143,6 @@ void acpi_os_release_mutex(acpi_mutex handle);
  */
 void *acpi_os_allocate(acpi_size size);
 
-void acpi_os_free(void *memory);
-
 acpi_status
 acpi_os_map_memory(acpi_physical_address physical_address,
                    acpi_size size, void __iomem ** logical_address);