From 914cae5b56f1ce5fed2343fb0489f2f78bf97c43 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Fri, 15 May 2009 04:33:54 +0000
Subject: [PATCH] --- yaml --- r: 145110 b: refs/heads/master c:
 c3cf8667ed7db58c1960958cbb0a9098d513cc60 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/powerpc/kernel/ftrace.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 44b175933420..0beefc656885 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 021376a3b655364c92c10be544a3319946a792e8
+refs/heads/master: c3cf8667ed7db58c1960958cbb0a9098d513cc60
diff --git a/trunk/arch/powerpc/kernel/ftrace.c b/trunk/arch/powerpc/kernel/ftrace.c
index 5b078ee391fc..2d182f119d1d 100644
--- a/trunk/arch/powerpc/kernel/ftrace.c
+++ b/trunk/arch/powerpc/kernel/ftrace.c
@@ -594,7 +594,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
 			PPC_LONG "2b,4b\n"
 		".previous"
 
-		: [old] "=r" (old), [faulted] "=r" (faulted)
+		: [old] "=&r" (old), [faulted] "=r" (faulted)
 		: [parent] "r" (parent), [return_hooker] "r" (return_hooker)
 		: "memory"
 	);