The following commit has been merged into the locking/kcsan branch of tip: Commit-ID: 8367aadcd83d2570fd4ce4af40ae7aec7c2bfcb7 Gitweb: https://git.kernel.org/tip/8367aadcd83d2570fd4ce4af40ae7aec7c2bfcb7 Author: Will Deacon <will@xxxxxxxxxx> AuthorDate: Mon, 11 May 2020 21:41:50 +01:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Tue, 12 May 2020 11:04:11 +02:00 linux/compiler.h: Remove redundant '#else' The '#else' clause after checking '#ifdef __KERNEL__' is empty in linux/compiler.h, so remove it. Signed-off-by: Will Deacon <will@xxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Acked-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20200511204150.27858-19-will@xxxxxxxxxx --- include/linux/compiler.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/linux/compiler.h b/include/linux/compiler.h index cce2c92..9bd0f76 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -331,7 +331,6 @@ unsigned long read_word_at_a_time(const void *addr) kcsan_enable_current(); \ __val; \ }) -#else #endif /* __KERNEL__ */
|