disable cpu isolcpus

hc

2023-12-09 958e46acc8e900e8569dd467c1af9b8d2d019394

 kernel/arch/s390/include/asm/jump_label.h
..
..
@@ -10,7 +10,9 @@
10
10
 #define JUMP_LABEL_NOP_SIZE 6
11
11
 #define JUMP_LABEL_NOP_OFFSET 2
12
12
 
13
-#if __GNUC__ < 9
13
+#ifdef CONFIG_CC_IS_CLANG
14
+#define JUMP_LABEL_STATIC_KEY_CONSTRAINT "i"
15
+#elif __GNUC__ < 9
14
16
 #define JUMP_LABEL_STATIC_KEY_CONSTRAINT "X"
15
17
 #else
16
18
 #define JUMP_LABEL_STATIC_KEY_CONSTRAINT "jdd"
..
..
@@ -22,13 +24,13 @@
22
24
  */
23
25
 static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
24
26
 {
25
-	asm_volatile_goto("0:	brcl 0,"__stringify(JUMP_LABEL_NOP_OFFSET)"\n"
26
-		".pushsection __jump_table, \"aw\"\n"
27
-		".balign 8\n"
28
-		".quad 0b, %l[label], %0+%1\n"
29
-		".popsection\n"
30
-		: : JUMP_LABEL_STATIC_KEY_CONSTRAINT (key), "i" (branch) : : label);
31
-
27
+	asm_volatile_goto("0:	brcl	0,"__stringify(JUMP_LABEL_NOP_OFFSET)"\n"
28
+			  ".pushsection __jump_table,\"aw\"\n"
29
+			  ".balign	8\n"
30
+			  ".long	0b-.,%l[label]-.\n"
31
+			  ".quad	%0+%1-.\n"
32
+			  ".popsection\n"
33
+			  : : JUMP_LABEL_STATIC_KEY_CONSTRAINT (key), "i" (branch) : : label);
32
34
 	return false;
33
35
 label:
34
36
 	return true;
..
..
@@ -36,25 +38,17 @@
36
38
 
37
39
 static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)
38
40
 {
39
-	asm_volatile_goto("0:	brcl 15, %l[label]\n"
40
-		".pushsection __jump_table, \"aw\"\n"
41
-		".balign 8\n"
42
-		".quad 0b, %l[label], %0+%1\n"
43
-		".popsection\n"
44
-		: : JUMP_LABEL_STATIC_KEY_CONSTRAINT (key), "i" (branch) : : label);
45
-
41
+	asm_volatile_goto("0:	brcl 15,%l[label]\n"
42
+			  ".pushsection __jump_table,\"aw\"\n"
43
+			  ".balign	8\n"
44
+			  ".long	0b-.,%l[label]-.\n"
45
+			  ".quad	%0+%1-.\n"
46
+			  ".popsection\n"
47
+			  : : JUMP_LABEL_STATIC_KEY_CONSTRAINT (key), "i" (branch) : : label);
46
48
 	return false;
47
49
 label:
48
50
 	return true;
49
51
 }
50
-
51
-typedef unsigned long jump_label_t;
52
-
53
-struct jump_entry {
54
-	jump_label_t code;
55
-	jump_label_t target;
56
-	jump_label_t key;
57
-};
58
52
 
59
53
 #endif  /* __ASSEMBLY__ */
60
54
 #endif