Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (44 commits)
  ACPI: remove function tracing macros from drivers/acpi/*.c
  ACPI: add support for Smart Battery
  ACPI: handle battery notify event on broken BIOS
  ACPI: handle AC notify event on broken BIOS
  ACPI: asus_acpi: add S1N WLED control
  ACPI: asus_acpi: correct M6N/M6R display nodes
  ACPI: asus_acpi: add S1N WLED control
  ACPI: asus_acpi: rework model detection
  ACPI: asus_acpi: support L5D
  ACPI: asus_acpi: handle internal Bluetooth / support W5A
  ACPI: asus_acpi: support A4G
  ACPI: asus_acpi: support W3400N
  ACPI: asus_acpi: LED display support
  ACPI: asus_acpi: support A3G
  ACPI: asus_acpi: misc cleanups
  ACPI: video: Remove unneeded acpi_handle from driver.
  ACPI: thermal: Remove unneeded acpi_handle from driver.
  ACPI: power: Remove unneeded acpi_handle from driver.
  ACPI: pci_root: Remove unneeded acpi_handle from driver.
  ACPI: pci_link: Remove unneeded acpi_handle from driver.
  ...

2 files changed, 7 insertions, 7 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