From b341c9647a41b449298ce6bc3524e91fc8c94835 Mon Sep 17 00:00:00 2001
From: Jon Medhurst <tixy@linaro.org>
Date: Thu, 25 Apr 2013 14:40:22 +0100
Subject: [PATCH] --- yaml --- r: 372117 b: refs/heads/master c:
 1783d4574619aea9ff5d94e6506f288547fc6737 h: refs/heads/master i:   372115:
 7252082c0a0e2089d10617c4c099c9c30e6365a1 v: v3

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

diff --git a/[refs] b/[refs]
index 1552aa4ad3b4..94b303bedbf0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3eb0be304273054fd2ae34367f96127d082e310c
+refs/heads/master: 1783d4574619aea9ff5d94e6506f288547fc6737
diff --git a/trunk/arch/arm/kernel/setup.c b/trunk/arch/arm/kernel/setup.c
index 234e339196c0..63ae04bdda1b 100644
--- a/trunk/arch/arm/kernel/setup.c
+++ b/trunk/arch/arm/kernel/setup.c
@@ -389,7 +389,7 @@ static void __init feat_v6_fixup(void)
  *
  * cpu_init sets up the per-CPU stacks.
  */
-void cpu_init(void)
+void notrace cpu_init(void)
 {
 	unsigned int cpu = smp_processor_id();
 	struct stack *stk = &stacks[cpu];