diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-13 05:05:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 05:05:51 -0400 |
| commit | accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6 (patch) | |
| tree | 8fb40782e79472ed882ff2098d4dd295557278ee /drivers/oprofile/cpu_buffer.c | |
| parent | 6852fd9b86d05063c6ef49d2e12e061cc7f6a105 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'linus' into oprofile-v2
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/oprofile/nmi_int.c
include/linux/pci_ids.h
Diffstat (limited to 'drivers/oprofile/cpu_buffer.c')
| -rw-r--r-- | drivers/oprofile/cpu_buffer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c index 4decab624e76..e1bd5a937f6c 100644 --- a/drivers/oprofile/cpu_buffer.c +++ b/drivers/oprofile/cpu_buffer.c | |||
| @@ -39,8 +39,10 @@ void free_cpu_buffers(void) | |||
| 39 | { | 39 | { |
| 40 | int i; | 40 | int i; |
| 41 | 41 | ||
| 42 | for_each_online_cpu(i) | 42 | for_each_online_cpu(i) { |
| 43 | vfree(per_cpu(cpu_buffer, i).buffer); | 43 | vfree(per_cpu(cpu_buffer, i).buffer); |
| 44 | per_cpu(cpu_buffer, i).buffer = NULL; | ||
| 45 | } | ||
| 44 | } | 46 | } |
| 45 | 47 | ||
| 46 | int alloc_cpu_buffers(void) | 48 | int alloc_cpu_buffers(void) |