Pull kmalloc into release branch

diff --combined arch/ia64/kernel/acpi-ext.c
index 2a1ef742e2239a3ea9ad7054c09a6be33c203fc9,ccd016537fe97623fe34d8a7fb845378b1a36a83..b7515bc808a8d815708c45124661e94cc4d63286
--- 1/arch/ia64/kernel/acpi-ext.c
--- 2/arch/ia64/kernel/acpi-ext.c
+++ b/arch/ia64/kernel/acpi-ext.c
@@@ -8,6 -8,7 +8,6 @@@
   * published by the Free Software Foundation.
   */
  
 -#include <linux/config.h>
  #include <linux/module.h>
  #include <linux/types.h>
  #include <linux/acpi.h>
@@@ -50,7 -51,7 +50,7 @@@ static acpi_status hp_ccsr_locate(acpi_
        memcpy(length, vendor->byte_data + 8, sizeof(*length));
  
    exit:
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
        return status;
  }
  

diff --combined arch/ia64/kernel/acpi.c
index ccdef199d91553078fd5ceb5d65abc9042eb1f57,c92c0aaaf2e652271bd9a1be938442eb7ca2adf6..99761b81db4496a78c0ea1eb0cb1076c438c8c3c
--- 1/arch/ia64/kernel/acpi.c
--- 2/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@@ -32,6 -32,7 +32,6 @@@
   * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   */
  
 -#include <linux/config.h>
  #include <linux/module.h>
  #include <linux/init.h>
  #include <linux/kernel.h>
@@@ -856,7 -857,7 +856,7 @@@ int acpi_map_lsapic(acpi_handle handle
        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 -865,13 +864,13 @@@
  
        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 -935,20 +934,20 @@@ acpi_map_iosapic(acpi_handle handle, u3
        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 --combined drivers/acpi/acpi_memhotplug.c
index cd57372a672942cffc5b7cfb74731ac3682494c2,2c626e81a289f35cba940dfaeb5f7148f911227b..84a68965c11ad38e475445cf1f318cc09ab05f15
--- 1/drivers/acpi/acpi_memhotplug.c
--- 2/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@@ -248,7 -248,7 +248,7 @@@ static int acpi_memory_enable_device(st
                num_enabled++;
        }
        if (!num_enabled) {
 -              ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "\nadd_memory failed\n"));
 +              printk(KERN_ERR PREFIX "add_memory failed\n");
                mem_device->state = MEMORY_INVALID_STATE;
                return -EINVAL;
        }
@@@ -466,7 -466,7 +466,7 @@@ static acpi_status is_memory_device(acp
  
        info = buffer.pointer;
        if (!(info->valid & ACPI_VALID_HID)) {
-               acpi_os_free(buffer.pointer);
+               kfree(buffer.pointer);
                return AE_ERROR;
        }
  
@@@ -475,7 -475,7 +475,7 @@@
            (strcmp(hardware_id, ACPI_MEMORY_DEVICE_HID)))
                status = AE_ERROR;
  
-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);
        return status;
  }
  

diff --combined drivers/acpi/osl.c
index 5dd2ed11a38755a57dd27685fa783549bcfa5d80,c68b1bb138c3bfd9c14485477424bfd6e66cf046..d4bd314d60baab5d02cac35612d78c5970411a26
--- 1/drivers/acpi/osl.c
--- 2/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@@ -25,6 -25,7 +25,6 @@@
   *
   */
  
 -#include <linux/config.h>
  #include <linux/module.h>
  #include <linux/kernel.h>
  #include <linux/slab.h>
@@@ -146,13 -147,6 +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 -736,7 +735,7 @@@ acpi_status acpi_os_delete_semaphore(ac
  
        ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Deleting semaphore[%p].\n", handle));
  
-       acpi_os_free(sem);
+       kfree(sem);
        sem = NULL;
  
        return AE_OK;

diff --combined drivers/acpi/scan.c
index 861ac378ce42c34eeddb2125e52682c9960bf0f0,a05b3dfb5cc5c71627868cf7fc7e29b55b001759..5fcb50c7b77802d135cbbe1368f96e8fabd6877e
--- 1/drivers/acpi/scan.c
--- 2/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -319,7 -319,7 +319,7 @@@ static int acpi_bus_get_wakeup_device_f
                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 +854,7 @@@ static void acpi_device_set_id(struct a
                        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)
@@@ -1433,7 -1433,7 +1433,7 @@@ static int acpi_device_resume(struct de
  }
  
  
 -struct bus_type acpi_bus_type = {
 +static struct bus_type acpi_bus_type = {
        .name           = "acpi",
        .suspend        = acpi_device_suspend,
        .resume         = acpi_device_resume,