[PATCH] (43/43) s390 __CHECKER__ ifdefs

[Al Viro <viro@www.linux.org.uk>]

remove the bogus games with explicit ifdefs on __CHECKER__

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
----
diff -urN RC13-rc6-git13-m68k-flags/drivers/s390/crypto/z90crypt.h RC13-rc6-git13-s390-ifdefs/drivers/s390/crypto/z90crypt.h
--- RC13-rc6-git13-m68k-flags/drivers/s390/crypto/z90crypt.h	2005-06-17 15:48:29.000000000 -0400
+++ RC13-rc6-git13-s390-ifdefs/drivers/s390/crypto/z90crypt.h	2005-08-21 13:17:46.000000000 -0400
@@ -36,15 +36,6 @@
 #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
  *
  * Requirements:
diff -urN RC13-rc6-git13-m68k-flags/include/asm-s390/uaccess.h RC13-rc6-git13-s390-ifdefs/include/asm-s390/uaccess.h
--- RC13-rc6-git13-m68k-flags/include/asm-s390/uaccess.h	2005-06-17 15:48:29.000000000 -0400
+++ RC13-rc6-git13-s390-ifdefs/include/asm-s390/uaccess.h	2005-08-21 13:17:46.000000000 -0400
@@ -149,11 +149,11 @@
 })
 #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 @@
 	 }							\
 	__pu_err;						\
 })
-#else
-#define __put_user(x, ptr)			\
-({						\
-	void __user *p;				\
-	p = (ptr);				\
-	0;					\
-})
-#endif
 
 #define put_user(x, ptr)					\
 ({								\
@@ -213,11 +205,11 @@
 })
 #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 @@
 	(x) = __x;						\
 	__gu_err;						\
 })
-#else
-#define __get_user(x, ptr)			\
-({						\
-	void __user *p;				\
-	p = (ptr);				\
-	0;					\
-})
-#endif
-
 
 #define get_user(x, ptr)					\
 ({								\
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/