diff options
| author | Thomas Gleixner | 2019-07-03 10:50:21 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2019-07-03 10:50:21 +0200 |
| commit | 341924049558e5f7c1a148a2c461a417933d35d9 (patch) | |
| tree | 1340b4f2131737ef4be63f18ee74cd73ad12cd3e /arch/s390/include | |
| parent | hrtimer: Use a bullet for the returns bullet list (diff) | |
| parent | MAINTAINERS: Fix Andy's surname and the directory entries of VDSO (diff) | |
| download | kernel-qcow2-linux-341924049558e5f7c1a148a2c461a417933d35d9.tar.gz kernel-qcow2-linux-341924049558e5f7c1a148a2c461a417933d35d9.tar.xz kernel-qcow2-linux-341924049558e5f7c1a148a2c461a417933d35d9.zip | |
Merge branch 'timers/vdso' into timers/core
so the hyper-v clocksource update can be applied.
Diffstat (limited to 'arch/s390/include')
| -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; |