From a5f911bcf99eae213610aead1e65dbb0e2c9d44b Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 14 Jun 2012 15:05:53 +0900
Subject: [PATCH] --- yaml --- r: 313749 b: refs/heads/master c:
 0412ddc82223ea2bb3a9db21355e5fe0862a97e5 h: refs/heads/master i:   313747:
 de60e9de32fc7bc01e2cb12090a53a03fb5a9a22 v: v3

---
 [refs]                     | 2 +-
 trunk/arch/sh/mm/tlb-sh5.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ee3b1ef5a9a0..bb1bce4c8f7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0375a73c6f1be69d5a9b439a7e95b92e54b3c09b
+refs/heads/master: 0412ddc82223ea2bb3a9db21355e5fe0862a97e5
diff --git a/trunk/arch/sh/mm/tlb-sh5.c b/trunk/arch/sh/mm/tlb-sh5.c
index 3aea25dc431a..ff1c40a31cbc 100644
--- a/trunk/arch/sh/mm/tlb-sh5.c
+++ b/trunk/arch/sh/mm/tlb-sh5.c
@@ -17,7 +17,7 @@
 /**
  * sh64_tlb_init - Perform initial setup for the DTLB and ITLB.
  */
-int __init sh64_tlb_init(void)
+int __cpuinit sh64_tlb_init(void)
 {
 	/* Assign some sane DTLB defaults */
 	cpu_data->dtlb.entries	= 64;