diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
| commit | 5e66dd6d66ffe758b39b6dcadf2330753ee1159b (patch) | |
| tree | a72cdcff4448e4af9425cc213ddf56ab23e697fe /drivers/acpi/processor_perflib.c | |
| parent | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/acpi/processor_perflib.c')
| -rw-r--r-- | drivers/acpi/processor_perflib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index 14a00e5a8f6a..7ba5e49ab302 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c | |||
| @@ -216,7 +216,7 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr) | |||
| 216 | sizeof(struct acpi_pct_register)); | 216 | sizeof(struct acpi_pct_register)); |
| 217 | 217 | ||
| 218 | end: | 218 | end: |
| 219 | acpi_os_free(buffer.pointer); | 219 | kfree(buffer.pointer); |
| 220 | 220 | ||
| 221 | return result; | 221 | return result; |
| 222 | } | 222 | } |
| @@ -294,7 +294,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr) | |||
| 294 | } | 294 | } |
| 295 | 295 | ||
| 296 | end: | 296 | end: |
| 297 | acpi_os_free(buffer.pointer); | 297 | kfree(buffer.pointer); |
| 298 | 298 | ||
| 299 | return result; | 299 | return result; |
| 300 | } | 300 | } |
| @@ -592,7 +592,7 @@ static int acpi_processor_get_psd(struct acpi_processor *pr) | |||
| 592 | } | 592 | } |
| 593 | 593 | ||
| 594 | end: | 594 | end: |
| 595 | acpi_os_free(buffer.pointer); | 595 | kfree(buffer.pointer); |
| 596 | return result; | 596 | return result; |
| 597 | } | 597 | } |
| 598 | 598 | ||
