mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge commit 'v2.6.27-rc5' into tip/oprofile
Conflicts: arch/x86/oprofile/nmi_int.c
This commit is contained in:
commit
f78e80209c
944 changed files with 31931 additions and 9920 deletions
|
|
@ -39,8 +39,10 @@ void free_cpu_buffers(void)
|
|||
{
|
||||
int i;
|
||||
|
||||
for_each_online_cpu(i)
|
||||
for_each_online_cpu(i) {
|
||||
vfree(per_cpu(cpu_buffer, i).buffer);
|
||||
per_cpu(cpu_buffer, i).buffer = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
int alloc_cpu_buffers(void)
|
||||
|
|
|
|||
|
|
@ -93,6 +93,8 @@ out:
|
|||
void free_event_buffer(void)
|
||||
{
|
||||
vfree(event_buffer);
|
||||
|
||||
event_buffer = NULL;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue