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/acpi-ext.c | |
parent | fc25465f09414538afdbceacc517dd4dbabadeca (diff) | |
parent | 02438d8771ae6a4b215938959827692026380bf9 (diff) |
Pull acpi_os_free into release branch
Diffstat (limited to 'arch/ia64/kernel/acpi-ext.c')
-rw-r--r-- | arch/ia64/kernel/acpi-ext.c | 2 |
1 files changed, 1 insertions, 1 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 | ||