From 7ca50f6aa26ba5b383f527b00a62b41e7ba8f103 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Tue, 14 Dec 2021 13:26:26 -0700 Subject: [PATCH] Revert "ANDROID: fix build error in arch/arm64/include/asm/arch_timer.h" This reverts commit 24430bad49d4b523c2dc7e531fb82ce8f37d415f. Commit 1edb7e74a7d3 ("clocksource/drivers/arm_arch_timer: Force inlining of erratum_set_next_event_generic()") in v5.16-rc5 resolves this error properly. Change-Id: I0a69d7ab4a5df43d16635fd95ddd7c91c55c72bd Test: BUILD_CONFIG=common/build.config.gki.aarch64 build/build.sh Signed-off-by: Nathan Chancellor --- arch/arm64/include/asm/arch_timer.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h index f2d37e8a9642..af1fafbe7e1d 100644 --- a/arch/arm64/include/asm/arch_timer.h +++ b/arch/arm64/include/asm/arch_timer.h @@ -129,6 +129,8 @@ void arch_timer_reg_write_cp15(int access, enum arch_timer_reg reg, u64 val) default: BUILD_BUG(); } + } else { + BUILD_BUG(); } } @@ -151,6 +153,7 @@ u64 arch_timer_reg_read_cp15(int access, enum arch_timer_reg reg) } } + BUILD_BUG(); unreachable(); }