From d511b983cbfe67cd3074deeac40974b2b6ba9e71 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 17 Jun 2008 17:43:02 +0200
Subject: [PATCH] --- yaml --- r: 100579 b: refs/heads/master c:
 ee4311adf105f4d740f52e3948acc1d81598afcc h: refs/heads/master i:   100577:
 e7316c2d1e177b82578a34ccf65cb60e34e60e33   100575:
 5686918ec72cfca5452fe6e6bbe44b2490c5d813 v: v3

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

diff --git a/[refs] b/[refs]
index 10b710e68832..fdefa8107e17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f22529351f7060d61eff3b76d7c9706f90aaedf3
+refs/heads/master: ee4311adf105f4d740f52e3948acc1d81598afcc
diff --git a/trunk/arch/x86/kernel/ftrace.c b/trunk/arch/x86/kernel/ftrace.c
index bc5cf8d46742..55828149e01e 100644
--- a/trunk/arch/x86/kernel/ftrace.c
+++ b/trunk/arch/x86/kernel/ftrace.c
@@ -88,7 +88,7 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code,
 		".previous\n"
 		_ASM_EXTABLE(1b, 3b)
 		: "=r"(faulted), "=a"(replaced)
-		: "r"(ip), "r"(new), "r"(newch),
+		: "r"(ip), "r"(new), "c"(newch),
 		  "0"(faulted), "a"(old)
 		: "memory");
 	sync_core();