diff options
| author | Len Brown <len.brown@intel.com> | 2006-07-01 23:19:08 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-07-01 23:19:08 +0200 |
| commit | b197ba3c70638a3a2ae39296781912f26ac0f991 (patch) | |
| tree | 596f795437337d86edaa02d612120f4d5b3ce35d /arch/ia64/kernel/acpi-ext.c | |
| parent | Merge branch 'audit.b22' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| parent | ACPI: delete acpi_os_free(), use kfree() directly (diff) | |
| download | linux-b197ba3c70638a3a2ae39296781912f26ac0f991.tar.xz linux-b197ba3c70638a3a2ae39296781912f26ac0f991.zip | |
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) memcpy(length, vendor->byte_data + 8, sizeof(*length)); exit: - acpi_os_free(buffer.pointer); + kfree(buffer.pointer); return status; } |