hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/arch/s390/include/asm/nmi.h
....@@ -12,7 +12,7 @@
1212 #ifndef _ASM_S390_NMI_H
1313 #define _ASM_S390_NMI_H
1414
15
-#include <linux/const.h>
15
+#include <linux/bits.h>
1616 #include <linux/types.h>
1717
1818 #define MCIC_SUBCLASS_MASK (1ULL<<63 | 1ULL<<62 | 1ULL<<61 | \
....@@ -20,15 +20,15 @@
2020 1ULL<<55 | 1ULL<<54 | 1ULL<<53 | \
2121 1ULL<<52 | 1ULL<<47 | 1ULL<<46 | \
2222 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)
3232
3333 #ifndef __ASSEMBLY__
3434
....@@ -99,7 +99,7 @@
9999 void nmi_free_per_cpu(struct lowcore *lc);
100100
101101 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);
103103
104104 #endif /* __ASSEMBLY__ */
105105 #endif /* _ASM_S390_NMI_H */