diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-30 20:07:01 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-30 20:07:01 -0400 |
| commit | ba290ab7dace8b3339c0cc86c221d48eed21e956 (patch) | |
| tree | b2e5d1e96b2799cd13010b140ffabd43e8f04963 /arch/ia64/kernel/acpi-ext.c | |
| parent | 9262e9149f346a5443300f8c451b8e7631e81a42 (diff) | |
| parent | 02438d8771ae6a4b215938959827692026380bf9 (diff) | |
Pull kmalloc 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 2a1ef742e22..b7515bc808a 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; } |