From da43e6f8ae19bc4700360a58531b74e40a5243a3 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Fri, 25 Jul 2008 01:48:39 -0700
Subject: [PATCH] --- yaml --- r: 106013 b: refs/heads/master c:
 a89cc1959d0ea5f36bf7421dc97b34f03809637d h: refs/heads/master i:   106011:
 2fc41e1c7576cc63c2650e00e28e613d7888139e v: v3

---
 [refs]                             | 2 +-
 trunk/kernel/trace/trace_sysprof.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bd26c75a26ce..b3abc49c406e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28325df0d9339b7f3aba9c45174d4586223ef46b
+refs/heads/master: a89cc1959d0ea5f36bf7421dc97b34f03809637d
diff --git a/trunk/kernel/trace/trace_sysprof.c b/trunk/kernel/trace/trace_sysprof.c
index 63528086337c..ce2d723c10e1 100644
--- a/trunk/kernel/trace/trace_sysprof.c
+++ b/trunk/kernel/trace/trace_sysprof.c
@@ -161,7 +161,7 @@ static void timer_notify(struct pt_regs *regs, int cpu)
 		__trace_special(tr, data, 2, regs->ip, 0);
 
 		while (i < sample_max_depth) {
-			frame.next_fp = 0;
+			frame.next_fp = NULL;
 			frame.return_address = 0;
 			if (!copy_stack_frame(fp, &frame))
 				break;