Pull kmalloc into release branch

[pandora-kernel.git] / arch / ia64 / kernel / acpi.c

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index ccdef19..99761b8 100644 (file)
--- 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)) {
        obj = buffer.pointer;
        if (obj->type != ACPI_TYPE_BUFFER ||
            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)
 
        if ((lsapic->header.type != ACPI_MADT_LSAPIC) ||
            (!lsapic->flags.enabled)) {
 
        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));
 
                return -EINVAL;
        }
 
        physid = ((lsapic->id << 8) | (lsapic->eid));
 

-       acpi_os_free(buffer.pointer);
+       kfree(buffer.pointer);

        buffer.length = ACPI_ALLOCATE_BUFFER;
        buffer.pointer = NULL;
 
        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)) {
        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) {
                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;
 
                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
 
        /*
         * OK, it's an IOSAPIC MADT entry, look for a _PXM value to tell