From 43a3c4ab70609672f7606907751ae178360ea932 Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt@console-pimps.org>
Date: Sat, 11 Jul 2009 00:29:04 +0000
Subject: [PATCH] --- yaml --- r: 163320 b: refs/heads/master c:
 7816fecd03e480ed0b47d674ed772ca0b45e1b5e h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/sh/kernel/process_32.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c282cba1f1c5..414c0b4926cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 327933f5d6cdf083284d3c06e0370d1de464aef4
+refs/heads/master: 7816fecd03e480ed0b47d674ed772ca0b45e1b5e
diff --git a/trunk/arch/sh/kernel/process_32.c b/trunk/arch/sh/kernel/process_32.c
index 92d7740faab1..9fee977f176b 100644
--- a/trunk/arch/sh/kernel/process_32.c
+++ b/trunk/arch/sh/kernel/process_32.c
@@ -23,6 +23,7 @@
 #include <linux/tick.h>
 #include <linux/reboot.h>
 #include <linux/fs.h>
+#include <linux/ftrace.h>
 #include <linux/preempt.h>
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
@@ -264,8 +265,8 @@ static void ubc_set_tracing(int asid, unsigned long pc)
  *	switch_to(x,y) should switch tasks from x to y.
  *
  */
-struct task_struct *__switch_to(struct task_struct *prev,
-				struct task_struct *next)
+__notrace_funcgraph struct task_struct *
+__switch_to(struct task_struct *prev, struct task_struct *next)
 {
 #if defined(CONFIG_SH_FPU)
 	unlazy_fpu(prev, task_pt_regs(prev));