From 3ad55208cbe0860314e7ff6bfa885b82ac30fc23 Mon Sep 17 00:00:00 2001
From: David Daney <david.daney@cavium.com>
Date: Tue, 15 May 2012 00:04:47 -0700
Subject: [PATCH] --- yaml --- r: 309021 b: refs/heads/master c:
 e3dc81f2306e650f01e38ec87e24c3fecb843dc3 h: refs/heads/master i:   309019:
 86790096a9cace158379de328ccbd3625e5a915d v: v3

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

diff --git a/[refs] b/[refs]
index 2fb1a4fdb660..43dfd30aafaa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcbf1dfde3da728144222930ae592acb06e92c7c
+refs/heads/master: e3dc81f2306e650f01e38ec87e24c3fecb843dc3
diff --git a/trunk/arch/mips/kernel/traps.c b/trunk/arch/mips/kernel/traps.c
index ed46c2b6354c..24325780f831 100644
--- a/trunk/arch/mips/kernel/traps.c
+++ b/trunk/arch/mips/kernel/traps.c
@@ -1632,7 +1632,7 @@ void __cpuinit per_cpu_trap_init(void)
 }
 
 /* Install CPU exception handler */
-void __init set_handler(unsigned long offset, void *addr, unsigned long size)
+void __cpuinit set_handler(unsigned long offset, void *addr, unsigned long size)
 {
 	memcpy((void *)(ebase + offset), addr, size);
 	local_flush_icache_range(ebase + offset, ebase + offset + size);