Merge commit 'v2.6.27-rc7' into x86/debug

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index 2450b3a393ff..7ba78e6d210e 100644
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -38,8 +38,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)