Commit bc9e3be20bab447519e864c4f9e09aae82ed0376
Committed by
Ingo Molnar
1 parent
46e1abc63e
Exists in
master
and in
7 other branches
include/asm-x86/percpu.h: checkpatch cleanups - formatting only
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Showing 1 changed file with 54 additions and 50 deletions Side-by-side Diff
include/asm-x86/percpu.h
... | ... | @@ -85,58 +85,62 @@ |
85 | 85 | * don't give an lvalue though). */ |
86 | 86 | extern void __bad_percpu_size(void); |
87 | 87 | |
88 | -#define percpu_to_op(op,var,val) \ | |
89 | - do { \ | |
90 | - typedef typeof(var) T__; \ | |
91 | - if (0) { T__ tmp__; tmp__ = (val); } \ | |
92 | - switch (sizeof(var)) { \ | |
93 | - case 1: \ | |
94 | - asm(op "b %1,"__percpu_seg"%0" \ | |
95 | - : "+m" (var) \ | |
96 | - :"ri" ((T__)val)); \ | |
97 | - break; \ | |
98 | - case 2: \ | |
99 | - asm(op "w %1,"__percpu_seg"%0" \ | |
100 | - : "+m" (var) \ | |
101 | - :"ri" ((T__)val)); \ | |
102 | - break; \ | |
103 | - case 4: \ | |
104 | - asm(op "l %1,"__percpu_seg"%0" \ | |
105 | - : "+m" (var) \ | |
106 | - :"ri" ((T__)val)); \ | |
107 | - break; \ | |
108 | - default: __bad_percpu_size(); \ | |
109 | - } \ | |
110 | - } while (0) | |
88 | +#define percpu_to_op(op, var, val) \ | |
89 | +do { \ | |
90 | + typedef typeof(var) T__; \ | |
91 | + if (0) { \ | |
92 | + T__ tmp__; \ | |
93 | + tmp__ = (val); \ | |
94 | + } \ | |
95 | + switch (sizeof(var)) { \ | |
96 | + case 1: \ | |
97 | + asm(op "b %1,"__percpu_seg"%0" \ | |
98 | + : "+m" (var) \ | |
99 | + : "ri" ((T__)val)); \ | |
100 | + break; \ | |
101 | + case 2: \ | |
102 | + asm(op "w %1,"__percpu_seg"%0" \ | |
103 | + : "+m" (var) \ | |
104 | + : "ri" ((T__)val)); \ | |
105 | + break; \ | |
106 | + case 4: \ | |
107 | + asm(op "l %1,"__percpu_seg"%0" \ | |
108 | + : "+m" (var) \ | |
109 | + : "ri" ((T__)val)); \ | |
110 | + break; \ | |
111 | + default: __bad_percpu_size(); \ | |
112 | + } \ | |
113 | +} while (0) | |
111 | 114 | |
112 | -#define percpu_from_op(op,var) \ | |
113 | - ({ \ | |
114 | - typeof(var) ret__; \ | |
115 | - switch (sizeof(var)) { \ | |
116 | - case 1: \ | |
117 | - asm(op "b "__percpu_seg"%1,%0" \ | |
118 | - : "=r" (ret__) \ | |
119 | - : "m" (var)); \ | |
120 | - break; \ | |
121 | - case 2: \ | |
122 | - asm(op "w "__percpu_seg"%1,%0" \ | |
123 | - : "=r" (ret__) \ | |
124 | - : "m" (var)); \ | |
125 | - break; \ | |
126 | - case 4: \ | |
127 | - asm(op "l "__percpu_seg"%1,%0" \ | |
128 | - : "=r" (ret__) \ | |
129 | - : "m" (var)); \ | |
130 | - break; \ | |
131 | - default: __bad_percpu_size(); \ | |
132 | - } \ | |
133 | - ret__; }) | |
115 | +#define percpu_from_op(op, var) \ | |
116 | +({ \ | |
117 | + typeof(var) ret__; \ | |
118 | + switch (sizeof(var)) { \ | |
119 | + case 1: \ | |
120 | + asm(op "b "__percpu_seg"%1,%0" \ | |
121 | + : "=r" (ret__) \ | |
122 | + : "m" (var)); \ | |
123 | + break; \ | |
124 | + case 2: \ | |
125 | + asm(op "w "__percpu_seg"%1,%0" \ | |
126 | + : "=r" (ret__) \ | |
127 | + : "m" (var)); \ | |
128 | + break; \ | |
129 | + case 4: \ | |
130 | + asm(op "l "__percpu_seg"%1,%0" \ | |
131 | + : "=r" (ret__) \ | |
132 | + : "m" (var)); \ | |
133 | + break; \ | |
134 | + default: __bad_percpu_size(); \ | |
135 | + } \ | |
136 | + ret__; \ | |
137 | +}) | |
134 | 138 | |
135 | 139 | #define x86_read_percpu(var) percpu_from_op("mov", per_cpu__##var) |
136 | -#define x86_write_percpu(var,val) percpu_to_op("mov", per_cpu__##var, val) | |
137 | -#define x86_add_percpu(var,val) percpu_to_op("add", per_cpu__##var, val) | |
138 | -#define x86_sub_percpu(var,val) percpu_to_op("sub", per_cpu__##var, val) | |
139 | -#define x86_or_percpu(var,val) percpu_to_op("or", per_cpu__##var, val) | |
140 | +#define x86_write_percpu(var, val) percpu_to_op("mov", per_cpu__##var, val) | |
141 | +#define x86_add_percpu(var, val) percpu_to_op("add", per_cpu__##var, val) | |
142 | +#define x86_sub_percpu(var, val) percpu_to_op("sub", per_cpu__##var, val) | |
143 | +#define x86_or_percpu(var, val) percpu_to_op("or", per_cpu__##var, val) | |
140 | 144 | #endif /* !__ASSEMBLY__ */ |
141 | 145 | #endif /* !CONFIG_X86_64 */ |
142 | 146 | #endif /* _ASM_X86_PERCPU_H_ */ |