From: Michael Ellerman <michael@ellerman.id.au>
Date: Mon, 24 Oct 2005 05:07:26 +0000 (+1000)
Subject: [PATCH] powerpc: Remove duplicate definition of set_tb()
X-Git-Tag: v2.6.15-rc1~59^2~100
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6f3546ecd00a1566cee6e0d992f4c33c2d28287;p=linux-2.6

[PATCH] powerpc: Remove duplicate definition of set_tb()

Somewhere along the line we got two definitions of set_tb(). They look to
be identical although they're not textually identical. So remove the #ifdef
CONFIG_PPC64 version, leaving the common version in time.h.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/include/asm-powerpc/reg.h b/include/asm-powerpc/reg.h
index 06a1f0f2db..68058d72d8 100644
--- a/include/asm-powerpc/reg.h
+++ b/include/asm-powerpc/reg.h
@@ -585,13 +585,6 @@ static inline void ppc64_runlatch_off(void)
 		mtspr(SPRN_CTRLT, ctrl);
 	}
 }
-
-static inline void set_tb(unsigned int upper, unsigned int lower)
-{
-	mttbl(0);
-	mttbu(upper);
-	mttbl(lower);
-}
 #endif
 
 #define __get_SP()	({unsigned long sp; \