From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Wed, 7 Oct 2015 08:54:36 +0000 (+0200)
Subject: s390/compiler.h Fix sparse vs. hotpatch
X-Git-Tag: v4.4-rc1~138^2~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c5a69f432ba1e586ac6ae5e4311c2f1cbd051fa;p=thirdparty%2Flinux.git

s390/compiler.h Fix sparse vs. hotpatch

sparse does not understand the s390 specific hotpatch attribute and
floods the log with messages like
include/uapi/linux/swab.h:92:8: error: attribute 'hotpatch': unknown attribute

Let's just dont use it, if __CHECKER__ is defined.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index c836eb2dc44d5..449cb674c7fa0 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -56,7 +56,7 @@ extern void __chk_io_ptr(const volatile void __iomem *);
 #include <linux/compiler-gcc.h>
 #endif
 
-#ifdef CC_USING_HOTPATCH
+#if defined(CC_USING_HOTPATCH) && !defined(__CHECKER__)
 #define notrace __attribute__((hotpatch(0,0)))
 #else
 #define notrace __attribute__((no_instrument_function))