]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
s390/ctl_reg: mark __ctl_set_bit and __ctl_clear_bit as __always_inline
authorGuenter Roeck <linux@roeck-us.net>
Sun, 9 Jun 2019 20:35:44 +0000 (13:35 -0700)
committerHeiko Carstens <heiko.carstens@de.ibm.com>
Tue, 11 Jun 2019 07:47:10 +0000 (09:47 +0200)
s390:tinyconfig fails to build with gcc 8.3.0.

arch/s390/include/asm/ctl_reg.h:52:2: error: impossible constraint in 'asm'
  asm volatile(       \
  ^~~
arch/s390/include/asm/ctl_reg.h:62:2: note: in expansion of macro '__ctl_store'
  __ctl_store(reg, cr, cr);
  ^~~~~~~~~~~
s390/include/asm/ctl_reg.h:41:2: error: impossible constraint in 'asm'
  asm volatile(       \
  ^~~
arch/s390/include/asm/ctl_reg.h:64:2:
note: in expansion of macro '__ctl_load'
  __ctl_load(reg, cr, cr);
  ^~~~~~~~~~

Marking __ctl_set_bit and __ctl_clear_bit as __always_inline fixes the
problem.

Fixes: 9012d011660e ("compiler: allow all arches to enable CONFIG_OPTIMIZE_INLINING")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
arch/s390/include/asm/ctl_reg.h

index 4600453536c2bc0e6842ac7e46cfc8b6ef10cea6..3bda757317cf1930a5924aa30fccdd4ffa5c2a62 100644 (file)
@@ -55,7 +55,7 @@
                : "i" (low), "i" (high));                               \
 } while (0)
 
-static inline void __ctl_set_bit(unsigned int cr, unsigned int bit)
+static __always_inline void __ctl_set_bit(unsigned int cr, unsigned int bit)
 {
        unsigned long reg;
 
@@ -64,7 +64,7 @@ static inline void __ctl_set_bit(unsigned int cr, unsigned int bit)
        __ctl_load(reg, cr, cr);
 }
 
-static inline void __ctl_clear_bit(unsigned int cr, unsigned int bit)
+static __always_inline void __ctl_clear_bit(unsigned int cr, unsigned int bit)
 {
        unsigned long reg;