shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ANDROID: fix build error in arch/arm64/include/asm/arch_timer.h"

Browse Source 
This reverts commit 24430bad49.

Commit 1edb7e74a7 ("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 <nathan@kernel.org>
This commit is contained in:
Nathan Chancellor
2021-12-14 13:26:26 -07:00
committed by Todd Kjos
parent 82f634cade
commit 7ca50f6aa2
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/include/asm/arch_timer.h
View File

@@ -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();
}