Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[PATCH] s390 __CHECKER__ ifdefs
remove the bogus games with explicit ifdefs on __CHECKER__
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
authored by
Al Viro
and committed by
Linus Torvalds
17566c3c
80322306
+2
-28
-9
drivers/s390/crypto/z90crypt.h
-9
drivers/s390/crypto/z90crypt.h
···
36
36
#define z90crypt_VARIANT 2 // 2 = added PCIXCC MCL3 and CEX2C support
37
37
38
38
/**
39
-
* If we are not using the sparse checker, __user has no use.
40
-
*/
41
-
#ifdef __CHECKER__
42
-
# define __user __attribute__((noderef, address_space(1)))
43
-
#else
44
-
# define __user
45
-
#endif
46
-
47
-
/**
48
39
* struct ica_rsa_modexpo
49
40
*
50
41
* Requirements:
+2
-19
include/asm-s390/uaccess.h
+2
-19
include/asm-s390/uaccess.h
···
149
149
})
150
150
#endif
151
151
152
-
#ifndef __CHECKER__
153
152
#define __put_user(x, ptr) \
154
153
({ \
155
154
__typeof__(*(ptr)) __x = (x); \
156
155
int __pu_err; \
156
+
__chk_user_ptr(ptr); \
157
157
switch (sizeof (*(ptr))) { \
158
158
case 1: \
159
159
case 2: \
···
167
167
} \
168
168
__pu_err; \
169
169
})
170
-
#else
171
-
#define __put_user(x, ptr) \
172
-
({ \
173
-
void __user *p; \
174
-
p = (ptr); \
175
-
0; \
176
-
})
177
-
#endif
178
170
179
171
#define put_user(x, ptr) \
180
172
({ \
···
205
213
})
206
214
#endif
207
215
208
-
#ifndef __CHECKER__
209
216
#define __get_user(x, ptr) \
210
217
({ \
211
218
__typeof__(*(ptr)) __x; \
212
219
int __gu_err; \
220
+
__chk_user_ptr(ptr); \
213
221
switch (sizeof(*(ptr))) { \
214
222
case 1: \
215
223
case 2: \
···
224
232
(x) = __x; \
225
233
__gu_err; \
226
234
})
227
-
#else
228
-
#define __get_user(x, ptr) \
229
-
({ \
230
-
void __user *p; \
231
-
p = (ptr); \
232
-
0; \
233
-
})
234
-
#endif
235
-
236
235
237
236
#define get_user(x, ptr) \
238
237
({ \