diff options
| author |   Guenter Roeck <linux@roeck-us.net> | 2019-06-09 13:35:44 -0700 |
|---|---|---|
| committer |   Heiko Carstens <heiko.carstens@de.ibm.com> | 2019-06-11 09:47:10 +0200 |
| commit | 93c2f55ffc89247079e4eb616c70ecc3c9614b05 (patch) | |
| tree | 6ec50341bebbbf75f3b9bf54d0f3a3d2b3225706 | |
| parent | s390/boot: disable address-of-packed-member warning (diff) | |
| download | linux-dev-93c2f55ffc89247079e4eb616c70ecc3c9614b05.tar.xz linux-dev-93c2f55ffc89247079e4eb616c70ecc3c9614b05.zip | |
s390/ctl_reg: mark __ctl_set_bit and __ctl_clear_bit as __always_inline
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>
| -rw-r--r-- | arch/s390/include/asm/ctl_reg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/include/asm/ctl_reg.h b/arch/s390/include/asm/ctl_reg.h index 4600453536c2..3bda757317cf 100644 --- a/arch/s390/include/asm/ctl_reg.h +++ b/arch/s390/include/asm/ctl_reg.h @@ -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; |