Merge commit 'v2.6.27-rc5' into tip/oprofile

Conflicts:
	arch/x86/oprofile/nmi_int.c
This commit is contained in:
Robert Richter 2008-09-24 11:25:31 +02:00
commit f78e80209c
944 changed files with 31931 additions and 9920 deletions

View file

@ -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)

View file

@ -93,6 +93,8 @@ out:
void free_event_buffer(void)
{
vfree(event_buffer);
event_buffer = NULL;
}