Commit 17566c3c authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] s390 __CHECKER__ ifdefs 



remove the bogus games with explicit ifdefs on __CHECKER__

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 80322306

drivers/s390/crypto/z90crypt.h

+0 −9
Original line number Diff line number Diff line
@@ -35,15 +35,6 @@ 
#define z90crypt_RELEASE 3	// 2 = PCIXCC, 3 = rewrite for coding standards

#define z90crypt_VARIANT 2	// 2 = added PCIXCC MCL3 and CEX2C support



/**

 * If we are not using the sparse checker, __user has no use.

 */

#ifdef __CHECKER__

# define __user		__attribute__((noderef, address_space(1)))

#else

# define __user

#endif



/**

 * struct ica_rsa_modexpo

 *

include/asm-s390/uaccess.h

+2 −19
Original line number Diff line number Diff line
@@ -149,11 +149,11 @@ struct exception_table_entry 
})

#endif



#ifndef __CHECKER__

#define __put_user(x, ptr) \

({								\

	__typeof__(*(ptr)) __x = (x);				\

	int __pu_err;						\

        __chk_user_ptr(ptr);                                    \

	switch (sizeof (*(ptr))) {				\

	case 1:							\

	case 2:							\
@@ -167,14 +167,6 @@ struct exception_table_entry 
	 }							\

	__pu_err;						\

})

#else

#define __put_user(x, ptr)			\

({						\

	void __user *p;				\

	p = (ptr);				\

	0;					\

})

#endif



#define put_user(x, ptr)					\

({								\
@@ -213,11 +205,11 @@ extern int __put_user_bad(void) __attribute__((noreturn)); 
})

#endif



#ifndef __CHECKER__

#define __get_user(x, ptr)					\

({								\

	__typeof__(*(ptr)) __x;					\

	int __gu_err;						\

        __chk_user_ptr(ptr);                                    \

	switch (sizeof(*(ptr))) {				\

	case 1:							\

	case 2:							\
@@ -232,15 +224,6 @@ extern int __put_user_bad(void) __attribute__((noreturn)); 
	(x) = __x;						\

	__gu_err;						\

})

#else

#define __get_user(x, ptr)			\

({						\

	void __user *p;				\

	p = (ptr);				\

	0;					\

})

#endif





#define get_user(x, ptr)					\

({								\