From 4ebacfef37cbe7519923a7834dd991e98eb7bd12 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 11 Oct 2007 23:46:14 +0100
Subject: [PATCH] --- yaml --- r: 66199 b: refs/heads/master c:
 aeffdbbaff133b0c3989e20af5baa091d3d0b409 h: refs/heads/master i:   66197:
 82511b127e9acbed62aed4dde338e23ff4644321   66195:
 6c0a1e9d1047ddaffbf7c8ca59e12bd2d8da46a1   66191:
 e35c3990305f21fa17a7f426c420bd74eafe8455 v: v3

---
 [refs]                     | 2 +-
 trunk/arch/mips/mm/tlbex.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 95fdbfdc4b1b..9320a920ce09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ac74d528dcfe3dcaa6072289d71fa96569f5e39
+refs/heads/master: aeffdbbaff133b0c3989e20af5baa091d3d0b409
diff --git a/trunk/arch/mips/mm/tlbex.c b/trunk/arch/mips/mm/tlbex.c
index b2c6b9e47564..73250741a0f9 100644
--- a/trunk/arch/mips/mm/tlbex.c
+++ b/trunk/arch/mips/mm/tlbex.c
@@ -35,24 +35,24 @@
 #include <asm/smp.h>
 #include <asm/war.h>
 
-static __init int __maybe_unused r45k_bvahwbug(void)
+static inline int r45k_bvahwbug(void)
 {
 	/* XXX: We should probe for the presence of this bug, but we don't. */
 	return 0;
 }
 
-static __init int __maybe_unused r4k_250MHZhwbug(void)
+static inline int r4k_250MHZhwbug(void)
 {
 	/* XXX: We should probe for the presence of this bug, but we don't. */
 	return 0;
 }
 
-static __init int __maybe_unused bcm1250_m3_war(void)
+static inline int __maybe_unused bcm1250_m3_war(void)
 {
 	return BCM1250_M3_WAR;
 }
 
-static __init int __maybe_unused r10000_llsc_war(void)
+static inline int __maybe_unused r10000_llsc_war(void)
 {
 	return R10000_LLSC_WAR;
 }