aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-06-30 03:19:10 -0400
committerLen Brown <len.brown@intel.com>2006-06-30 03:19:10 -0400
commit02438d8771ae6a4b215938959827692026380bf9 (patch)
treecae56539e00a35770c36a1f9c03eebe65d1e9186 /arch/ia64
parentd120cfb544ed6161b9d32fb6c4648c471807ee6b (diff)
ACPI: delete acpi_os_free(), use kfree() directly
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kernel/acpi-ext.c2
-rw-r--r--arch/ia64/kernel/acpi.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/ia64/kernel/acpi-ext.c b/arch/ia64/kernel/acpi-ext.c
index fff82929d225..ccd016537fe9 100644
--- a/arch/ia64/kernel/acpi-ext.c
+++ b/arch/ia64/kernel/acpi-ext.c
@@ -51,7 +51,7 @@ static acpi_status hp_ccsr_locate(acpi_handle obj, u64 *base, u64 *length)
51 memcpy(length, vendor->byte_data + 8, sizeof(*length)); 51 memcpy(length, vendor->byte_data + 8, sizeof(*length));
52 52
53 exit: 53 exit:
54 acpi_os_free(buffer.pointer); 54 kfree(buffer.pointer);
55 return status; 55 return status;
56} 56}
57 57
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index ca16d9556bde..c92c0aaaf2e6 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -857,7 +857,7 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
857 obj = buffer.pointer; 857 obj = buffer.pointer;
858 if (obj->type != ACPI_TYPE_BUFFER || 858 if (obj->type != ACPI_TYPE_BUFFER ||
859 obj->buffer.length < sizeof(*lsapic)) { 859 obj->buffer.length < sizeof(*lsapic)) {
860 acpi_os_free(buffer.pointer); 860 kfree(buffer.pointer);
861 return -EINVAL; 861 return -EINVAL;
862 } 862 }
863 863
@@ -865,13 +865,13 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
865 865
866 if ((lsapic->header.type != ACPI_MADT_LSAPIC) || 866 if ((lsapic->header.type != ACPI_MADT_LSAPIC) ||
867 (!lsapic->flags.enabled)) { 867 (!lsapic->flags.enabled)) {
868 acpi_os_free(buffer.pointer); 868 kfree(buffer.pointer);
869 return -EINVAL; 869 return -EINVAL;
870 } 870 }
871 871
872 physid = ((lsapic->id << 8) | (lsapic->eid)); 872 physid = ((lsapic->id << 8) | (lsapic->eid));
873 873
874 acpi_os_free(buffer.pointer); 874 kfree(buffer.pointer);
875 buffer.length = ACPI_ALLOCATE_BUFFER; 875 buffer.length = ACPI_ALLOCATE_BUFFER;
876 buffer.pointer = NULL; 876 buffer.pointer = NULL;
877 877
@@ -935,20 +935,20 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret)
935 obj = buffer.pointer; 935 obj = buffer.pointer;
936 if (obj->type != ACPI_TYPE_BUFFER || 936 if (obj->type != ACPI_TYPE_BUFFER ||
937 obj->buffer.length < sizeof(*iosapic)) { 937 obj->buffer.length < sizeof(*iosapic)) {
938 acpi_os_free(buffer.pointer); 938 kfree(buffer.pointer);
939 return AE_OK; 939 return AE_OK;
940 } 940 }
941 941
942 iosapic = (struct acpi_table_iosapic *)obj->buffer.pointer; 942 iosapic = (struct acpi_table_iosapic *)obj->buffer.pointer;
943 943
944 if (iosapic->header.type != ACPI_MADT_IOSAPIC) { 944 if (iosapic->header.type != ACPI_MADT_IOSAPIC) {
945 acpi_os_free(buffer.pointer); 945 kfree(buffer.pointer);
946 return AE_OK; 946 return AE_OK;
947 } 947 }
948 948
949 gsi_base = iosapic->global_irq_base; 949 gsi_base = iosapic->global_irq_base;
950 950
951 acpi_os_free(buffer.pointer); 951 kfree(buffer.pointer);
952 952
953 /* 953 /*
954 * OK, it's an IOSAPIC MADT entry, look for a _PXM value to tell 954 * OK, it's an IOSAPIC MADT entry, look for a _PXM value to tell