diff options
author | Len Brown <len.brown@intel.com> | 2006-07-01 17:19:08 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-07-01 17:19:08 -0400 |
commit | b197ba3c70638a3a2ae39296781912f26ac0f991 (patch) | |
tree | 596f795437337d86edaa02d612120f4d5b3ce35d /arch/ia64/kernel | |
parent | fc25465f09414538afdbceacc517dd4dbabadeca (diff) | |
parent | 02438d8771ae6a4b215938959827692026380bf9 (diff) |
Pull acpi_os_free into release branch
Diffstat (limited to 'arch/ia64/kernel')
-rw-r--r-- | arch/ia64/kernel/acpi-ext.c | 2 | ||||
-rw-r--r-- | arch/ia64/kernel/acpi.c | 12 |
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) | |||
50 | memcpy(length, vendor->byte_data + 8, sizeof(*length)); | 50 | memcpy(length, vendor->byte_data + 8, sizeof(*length)); |
51 | 51 | ||
52 | exit: | 52 | exit: |
53 | acpi_os_free(buffer.pointer); | 53 | kfree(buffer.pointer); |
54 | return status; | 54 | return status; |
55 | } | 55 | } |
56 | 56 | ||
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) | |||
856 | obj = buffer.pointer; | 856 | obj = buffer.pointer; |
857 | if (obj->type != ACPI_TYPE_BUFFER || | 857 | if (obj->type != ACPI_TYPE_BUFFER || |
858 | obj->buffer.length < sizeof(*lsapic)) { | 858 | obj->buffer.length < sizeof(*lsapic)) { |
859 | acpi_os_free(buffer.pointer); | 859 | kfree(buffer.pointer); |
860 | return -EINVAL; | 860 | return -EINVAL; |
861 | } | 861 | } |
862 | 862 | ||
@@ -864,13 +864,13 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu) | |||
864 | 864 | ||
865 | if ((lsapic->header.type != ACPI_MADT_LSAPIC) || | 865 | if ((lsapic->header.type != ACPI_MADT_LSAPIC) || |
866 | (!lsapic->flags.enabled)) { | 866 | (!lsapic->flags.enabled)) { |
867 | acpi_os_free(buffer.pointer); | 867 | kfree(buffer.pointer); |
868 | return -EINVAL; | 868 | return -EINVAL; |
869 | } | 869 | } |
870 | 870 | ||
871 | physid = ((lsapic->id << 8) | (lsapic->eid)); | 871 | physid = ((lsapic->id << 8) | (lsapic->eid)); |
872 | 872 | ||
873 | acpi_os_free(buffer.pointer); | 873 | kfree(buffer.pointer); |
874 | buffer.length = ACPI_ALLOCATE_BUFFER; | 874 | buffer.length = ACPI_ALLOCATE_BUFFER; |
875 | buffer.pointer = NULL; | 875 | buffer.pointer = NULL; |
876 | 876 | ||
@@ -934,20 +934,20 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret) | |||
934 | obj = buffer.pointer; | 934 | obj = buffer.pointer; |
935 | if (obj->type != ACPI_TYPE_BUFFER || | 935 | if (obj->type != ACPI_TYPE_BUFFER || |
936 | obj->buffer.length < sizeof(*iosapic)) { | 936 | obj->buffer.length < sizeof(*iosapic)) { |
937 | acpi_os_free(buffer.pointer); | 937 | kfree(buffer.pointer); |
938 | return AE_OK; | 938 | return AE_OK; |
939 | } | 939 | } |
940 | 940 | ||
941 | iosapic = (struct acpi_table_iosapic *)obj->buffer.pointer; | 941 | iosapic = (struct acpi_table_iosapic *)obj->buffer.pointer; |
942 | 942 | ||
943 | if (iosapic->header.type != ACPI_MADT_IOSAPIC) { | 943 | if (iosapic->header.type != ACPI_MADT_IOSAPIC) { |
944 | acpi_os_free(buffer.pointer); | 944 | kfree(buffer.pointer); |
945 | return AE_OK; | 945 | return AE_OK; |
946 | } | 946 | } |
947 | 947 | ||
948 | gsi_base = iosapic->global_irq_base; | 948 | gsi_base = iosapic->global_irq_base; |
949 | 949 | ||
950 | acpi_os_free(buffer.pointer); | 950 | kfree(buffer.pointer); |
951 | 951 | ||
952 | /* | 952 | /* |
953 | * OK, it's an IOSAPIC MADT entry, look for a _PXM value to tell | 953 | * OK, it's an IOSAPIC MADT entry, look for a _PXM value to tell |