[PATCH] powerpc/time: Remove ifdef in get_vtb()

Subsystems: linux for powerpc (32-bit and 64-bit), the rest · Maintainers: Madhavan Srinivasan, Linus Torvalds

STALE2147d LANDED

Status: Landed in mainline as c3cb5dbd85db on 2020-12-03.

2 messages, 2 authors, 2020-12-10 · open the first message on its own page

[PATCH] powerpc/time: Remove ifdef in get_vtb()

From: Christophe Leroy <hidden>
Date: 2020-10-01 10:59:26

SPRN_VTB and CPU_FTR_ARCH_207S are always defined,
no need of an ifdef.

Signed-off-by: Christophe Leroy <redacted>
---
 arch/powerpc/include/asm/time.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/powerpc/include/asm/time.h b/arch/powerpc/include/asm/time.h
index cb326720a8a1..6c663a382a75 100644
--- a/arch/powerpc/include/asm/time.h
+++ b/arch/powerpc/include/asm/time.h
@@ -80,10 +80,9 @@ static inline u64 get_rtc(void)
 
 static inline u64 get_vtb(void)
 {
-#ifdef CONFIG_PPC_BOOK3S_64
 	if (cpu_has_feature(CPU_FTR_ARCH_207S))
 		return mfspr(SPRN_VTB);
-#endif
+
 	return 0;
 }
 
-- 
2.25.0

Re: [PATCH] powerpc/time: Remove ifdef in get_vtb()

From: Michael Ellerman <hidden>
Date: 2020-12-10 11:36:12

On Thu, 1 Oct 2020 10:59:20 +0000 (UTC), Christophe Leroy wrote:
SPRN_VTB and CPU_FTR_ARCH_207S are always defined,
no need of an ifdef.
Applied to powerpc/next.

[1/1] powerpc/time: Remove ifdef in get_vtb()
      https://git.kernel.org/powerpc/c/c3cb5dbd85dbd9ae51fadf867782dc34806f04d8

cheers
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help