diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2005-10-24 01:07:26 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-26 02:00:09 -0400 |
commit | a6f3546ecd00a1566cee6e0d992f4c33c2d28287 (patch) | |
tree | e77f204d13dc153672b90a850006fbcac1c7677e | |
parent | 6d7f58b04d824843f7539a132e1ad8220bbe589a (diff) |
[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>
-rw-r--r-- | include/asm-powerpc/reg.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/asm-powerpc/reg.h b/include/asm-powerpc/reg.h index 06a1f0f2db21..68058d72d8da 100644 --- a/include/asm-powerpc/reg.h +++ b/include/asm-powerpc/reg.h | |||
@@ -585,13 +585,6 @@ static inline void ppc64_runlatch_off(void) | |||
585 | mtspr(SPRN_CTRLT, ctrl); | 585 | mtspr(SPRN_CTRLT, ctrl); |
586 | } | 586 | } |
587 | } | 587 | } |
588 | |||
589 | static inline void set_tb(unsigned int upper, unsigned int lower) | ||
590 | { | ||
591 | mttbl(0); | ||
592 | mttbu(upper); | ||
593 | mttbl(lower); | ||
594 | } | ||
595 | #endif | 588 | #endif |
596 | 589 | ||
597 | #define __get_SP() ({unsigned long sp; \ | 590 | #define __get_SP() ({unsigned long sp; \ |