From 24430bad49d4b523c2dc7e531fb82ce8f37d415f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 5 Nov 2021 14:20:43 +0100 Subject: [PATCH] ANDROID: fix build error in arch/arm64/include/asm/arch_timer.h clang is throwing up when it hits the BUILD_BUG_ON() macro at the moment, so remove it from arch_time.h for arm64 to fix the build at this point in time. Fixes: a1cb80290f8d ("Merge 57a315cd7198 ("Merge tag 'timers-core-2021-10-31' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline") Cc: Nick Desaulniers Cc: Marc Zyngier Signed-off-by: Greg Kroah-Hartman Change-Id: I0ccd2fa80b3f9fea92464ba40cd3ca6ad013a5d1 --- arch/arm64/include/asm/arch_timer.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h index 519ac1f7f859..f3568ec5258c 100644 --- a/arch/arm64/include/asm/arch_timer.h +++ b/arch/arm64/include/asm/arch_timer.h @@ -117,8 +117,6 @@ void arch_timer_reg_write_cp15(int access, enum arch_timer_reg reg, u64 val) default: BUILD_BUG(); } - } else { - BUILD_BUG(); } } @@ -141,7 +139,6 @@ u64 arch_timer_reg_read_cp15(int access, enum arch_timer_reg reg) } } - BUILD_BUG(); unreachable(); }