Merge commit 'v2.6.27-rc8' into oprofile

Conflicts: arch/x86/oprofile/nmi_int.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-09-30 12:16:26 +02:00
parent 45f197ade7 94aca1dac6
commit 59293c8ad5
1553 changed files with 40995 additions and 16515 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)