disable pwm7

hc

2024-05-10 23fa18eaa71266feff7ba8d83022d9e1cc83c65a

 kernel/arch/s390/include/asm/nmi.h
..
..
@@ -12,7 +12,7 @@
12
12
 #ifndef _ASM_S390_NMI_H
13
13
 #define _ASM_S390_NMI_H
14
14
 
15
-#include <linux/const.h>
15
+#include <linux/bits.h>
16
16
 #include <linux/types.h>
17
17
 
18
18
 #define MCIC_SUBCLASS_MASK	(1ULL<<63 | 1ULL<<62 | 1ULL<<61 | \
..
..
@@ -20,15 +20,15 @@
20
20
 				1ULL<<55 | 1ULL<<54 | 1ULL<<53 | \
21
21
 				1ULL<<52 | 1ULL<<47 | 1ULL<<46 | \
22
22
 				1ULL<<45 | 1ULL<<44)
23
-#define MCCK_CODE_SYSTEM_DAMAGE		_BITUL(63)
24
-#define MCCK_CODE_EXT_DAMAGE		_BITUL(63 - 5)
25
-#define MCCK_CODE_CP			_BITUL(63 - 9)
26
-#define MCCK_CODE_CPU_TIMER_VALID	_BITUL(63 - 46)
27
-#define MCCK_CODE_PSW_MWP_VALID		_BITUL(63 - 20)
28
-#define MCCK_CODE_PSW_IA_VALID		_BITUL(63 - 23)
29
-#define MCCK_CODE_CR_VALID		_BITUL(63 - 29)
30
-#define MCCK_CODE_GS_VALID		_BITUL(63 - 36)
31
-#define MCCK_CODE_FC_VALID		_BITUL(63 - 43)
23
+#define MCCK_CODE_SYSTEM_DAMAGE		BIT(63)
24
+#define MCCK_CODE_EXT_DAMAGE		BIT(63 - 5)
25
+#define MCCK_CODE_CP			BIT(63 - 9)
26
+#define MCCK_CODE_CPU_TIMER_VALID	BIT(63 - 46)
27
+#define MCCK_CODE_PSW_MWP_VALID		BIT(63 - 20)
28
+#define MCCK_CODE_PSW_IA_VALID		BIT(63 - 23)
29
+#define MCCK_CODE_CR_VALID		BIT(63 - 29)
30
+#define MCCK_CODE_GS_VALID		BIT(63 - 36)
31
+#define MCCK_CODE_FC_VALID		BIT(63 - 43)
32
32
 
33
33
 #ifndef __ASSEMBLY__
34
34
 
..
..
@@ -99,7 +99,7 @@
99
99
 void nmi_free_per_cpu(struct lowcore *lc);
100
100
 
101
101
 void s390_handle_mcck(void);
102
-void s390_do_machine_check(struct pt_regs *regs);
102
+int s390_do_machine_check(struct pt_regs *regs);
103
103
 
104
104
 #endif /* __ASSEMBLY__ */
105
105
 #endif /* _ASM_S390_NMI_H */