lkml.org 
[lkml]   [2020]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip: locking/kcsan] linux/compiler.h: Remove redundant '#else'
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(-)

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

\
 
 \ /
  Last update: 2020-05-12 16:38    [W:0.390 / U:0.228 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site