[tip:,locking/kcsan] linux/compiler.h: Remove redundant '#else'
diff mbox series

Message ID 158929421876.390.5641049290756529509.tip-bot2@tip-bot2
State In Next
Commit 8367aadcd83d2570fd4ce4af40ae7aec7c2bfcb7
Headers show
Series
  • [tip:,locking/kcsan] linux/compiler.h: Remove redundant '#else'
Related show

Commit Message

tip-bot2 for Wei Yongjun May 12, 2020, 2:36 p.m. UTC
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@kernel.org>
AuthorDate:    Mon, 11 May 2020 21:41:50 +01:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
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@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200511204150.27858-19-will@kernel.org

---
 include/linux/compiler.h | 1 -
 1 file changed, 1 deletion(-)

Patch
diff mbox series

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__ */