diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
| commit | 5a84d159061d914c8dd4aa372ac6e9529c2be453 (patch) | |
| tree | 9b08af78085334af44414adafe0096276f8fe0ff /include/asm-s390/system.h | |
| parent | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (diff) | |
| parent | 7d477a04a619e90ee08724e8f2d8803c6bdfcef8 (diff) | |
Merge ARM fixes
Diffstat (limited to 'include/asm-s390/system.h')
| -rw-r--r-- | include/asm-s390/system.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-s390/system.h b/include/asm-s390/system.h index bd0b05ae87d2..bbe137c3ed69 100644 --- a/include/asm-s390/system.h +++ b/include/asm-s390/system.h | |||
| @@ -373,8 +373,8 @@ __set_psw_mask(unsigned long mask) | |||
| 373 | __load_psw_mask(mask | (__raw_local_irq_stosm(0x00) & ~(-1UL >> 8))); | 373 | __load_psw_mask(mask | (__raw_local_irq_stosm(0x00) & ~(-1UL >> 8))); |
| 374 | } | 374 | } |
| 375 | 375 | ||
| 376 | #define local_mcck_enable() __set_psw_mask(PSW_KERNEL_BITS) | 376 | #define local_mcck_enable() __set_psw_mask(psw_kernel_bits) |
| 377 | #define local_mcck_disable() __set_psw_mask(PSW_KERNEL_BITS & ~PSW_MASK_MCHECK) | 377 | #define local_mcck_disable() __set_psw_mask(psw_kernel_bits & ~PSW_MASK_MCHECK) |
| 378 | 378 | ||
| 379 | #ifdef CONFIG_SMP | 379 | #ifdef CONFIG_SMP |
| 380 | 380 | ||