uaccess: move VERIFY_{READ,WRITE} definitions to linux/uaccess.h

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2016-12-27 18:00:15 -05:00 · 2016-12-27 18:00:15 -05:00 · 5e6039d8a3
--- a/arch/alpha/include/asm/uaccess.h
+++ b/arch/alpha/include/asm/uaccess.h
@ -20,9 +20,6 @@
 #define KERNEL_DS	((mm_segment_t) { 0UL })
 #define USER_DS		((mm_segment_t) { -0x40000000000UL })

-#define VERIFY_READ	0
-#define VERIFY_WRITE	1
-
 #define get_fs()  (current_thread_info()->addr_limit)
 #define get_ds()  (KERNEL_DS)
 #define set_fs(x) (current_thread_info()->addr_limit = (x))
--- a/arch/arm/include/asm/uaccess.h
+++ b/arch/arm/include/asm/uaccess.h
@ -26,9 +26,6 @@
 #define __put_user_unaligned __put_user
 #endif

-#define VERIFY_READ 0
-#define VERIFY_WRITE 1
-
 /*
 * The exception table consists of pairs of addresses: the first is the
 * address of an instruction that is allowed to fault, and the second is
--- a/arch/arm64/include/asm/uaccess.h
+++ b/arch/arm64/include/asm/uaccess.h
@ -36,9 +36,6 @@
 #include <asm/memory.h>
 #include <asm/compiler.h>

-#define VERIFY_READ 0
-#define VERIFY_WRITE 1
-
 /*
 * The exception table consists of pairs of relative offsets: the first
 * is the relative offset to an instruction that is allowed to fault,
--- a/arch/avr32/include/asm/uaccess.h
+++ b/arch/avr32/include/asm/uaccess.h
@ -11,9 +11,6 @@
 #include <linux/errno.h>
 #include <linux/sched.h>

-#define VERIFY_READ	0
-#define VERIFY_WRITE	1
-
 typedef struct {
 	unsigned int is_user_space;
 } mm_segment_t;
--- a/arch/blackfin/include/asm/uaccess.h
+++ b/arch/blackfin/include/asm/uaccess.h
@ -29,9 +29,6 @@ static inline void set_fs(mm_segment_t fs)

 #define segment_eq(a, b) ((a) == (b))

-#define VERIFY_READ	0
-#define VERIFY_WRITE	1
-
 #define access_ok(type, addr, size) _access_ok((unsigned long)(addr), (size))

 /*
--- a/arch/cris/include/asm/uaccess.h
+++ b/arch/cris/include/asm/uaccess.h
@ -21,9 +21,6 @@
 #include <asm/processor.h>
 #include <asm/page.h>

-#define VERIFY_READ	0
-#define VERIFY_WRITE	1
-
 /*
 * The fs value determines whether argument validity checking should be
 * performed or not.  If get_fs() == USER_DS, checking is performed, with
--- a/arch/frv/include/asm/uaccess.h
+++ b/arch/frv/include/asm/uaccess.h
@ -22,9 +22,6 @@

 #define __ptr(x) ((unsigned long __force *)(x))

-#define VERIFY_READ	0
-#define VERIFY_WRITE	1
-
 /*
 * check that a range of addresses falls within the current address limit
 */
--- a/arch/hexagon/include/asm/uaccess.h
+++ b/arch/hexagon/include/asm/uaccess.h
@ -50,8 +50,6 @@
 * reasonably simple and not *too* slow.  After all, we've got the
 * MMU for backup.
 */
-#define VERIFY_READ     0
-#define VERIFY_WRITE    1

 #define __access_ok(addr, size) \
 	((get_fs().seg == KERNEL_DS.seg) || \
--- a/arch/ia64/include/asm/uaccess.h
+++ b/arch/ia64/include/asm/uaccess.h
@ -48,9 +48,6 @@
 #define KERNEL_DS	((mm_segment_t) { ~0UL })		/* cf. access_ok() */
 #define USER_DS		((mm_segment_t) { TASK_SIZE-1 })	/* cf. access_ok() */

-#define VERIFY_READ	0
-#define VERIFY_WRITE	1
-
 #define get_ds()  (KERNEL_DS)
 #define get_fs()  (current_thread_info()->addr_limit)
 #define set_fs(x) (current_thread_info()->addr_limit = (x))
--- a/arch/m32r/include/asm/uaccess.h
+++ b/arch/m32r/include/asm/uaccess.h
@ -16,9 +16,6 @@
 #include <asm/page.h>
 #include <asm/setup.h>

-#define VERIFY_READ 0
-#define VERIFY_WRITE 1
-
 /*
 * The fs value determines whether argument validity checking should be
 * performed or not.  If get_fs() == USER_DS, checking is performed, with
--- a/arch/m68k/include/asm/uaccess_mm.h
+++ b/arch/m68k/include/asm/uaccess_mm.h
@ -10,9 +10,6 @@
 #include <linux/sched.h>
 #include <asm/segment.h>

-#define VERIFY_READ	0
-#define VERIFY_WRITE	1
-
 /* We let the MMU do all checking */
 static inline int access_ok(int type, const void __user *addr,
 			    unsigned long size)
--- a/arch/m68k/include/asm/uaccess_no.h
+++ b/arch/m68k/include/asm/uaccess_no.h
@ -10,9 +10,6 @@

 #include <asm/segment.h>

-#define VERIFY_READ	0
-#define VERIFY_WRITE	1
-
 #define access_ok(type,addr,size)	_access_ok((unsigned long)(addr),(size))

 /*
--- a/arch/metag/include/asm/uaccess.h
+++ b/arch/metag/include/asm/uaccess.h
@ -6,9 +6,6 @@
 */
 #include <linux/sched.h>

-#define VERIFY_READ	0
-#define VERIFY_WRITE	1
-
 /*
 * The fs value determines whether argument validity checking should be
 * performed or not.  If get_fs() == USER_DS, checking is performed, with
--- a/arch/microblaze/include/asm/uaccess.h
+++ b/arch/microblaze/include/asm/uaccess.h
@ -24,9 +24,6 @@
 #include <asm/pgtable.h>
 #include <linux/string.h>

-#define VERIFY_READ	0
-#define VERIFY_WRITE	1
-
 /*
 * On Microblaze the fs value is actually the top of the corresponding
 * address space.
--- a/arch/mips/include/asm/uaccess.h
+++ b/arch/mips/include/asm/uaccess.h
@ -71,9 +71,6 @@ extern u64 __ua_limit;
 #define USER_DS		((mm_segment_t) { __UA_LIMIT })
 #endif

-#define VERIFY_READ    0
-#define VERIFY_WRITE   1
-
 #define get_ds()	(KERNEL_DS)
 #define get_fs()	(current_thread_info()->addr_limit)
 #define set_fs(x)	(current_thread_info()->addr_limit = (x))
--- a/arch/mn10300/include/asm/uaccess.h
+++ b/arch/mn10300/include/asm/uaccess.h
@ -19,9 +19,6 @@
 #include <asm/page.h>
 #include <asm/errno.h>

-#define VERIFY_READ 0
-#define VERIFY_WRITE 1
-
 /*
 * The fs value determines whether argument validity checking should be
 * performed or not.  If get_fs() == USER_DS, checking is performed, with
--- a/arch/nios2/include/asm/uaccess.h
+++ b/arch/nios2/include/asm/uaccess.h
@ -19,9 +19,6 @@

 #include <asm/page.h>

-#define VERIFY_READ	0
-#define VERIFY_WRITE	1
-
 /*
 * The exception table consists of pairs of addresses: the first is the
 * address of an instruction that is allowed to fault, and the second is
--- a/arch/openrisc/include/asm/uaccess.h
+++ b/arch/openrisc/include/asm/uaccess.h
@ -28,9 +28,6 @@
 #include <linux/string.h>
 #include <asm/page.h>

-#define VERIFY_READ	0
-#define VERIFY_WRITE	1
-
 /*
 * The fs value determines whether argument validity checking should be
 * performed or not.  If get_fs() == USER_DS, checking is performed, with
--- a/arch/parisc/include/asm/uaccess.h
+++ b/arch/parisc/include/asm/uaccess.h
@ -13,9 +13,6 @@
 #include <linux/string.h>
 #include <linux/thread_info.h>

-#define VERIFY_READ 0
-#define VERIFY_WRITE 1
-
 #define KERNEL_DS	((mm_segment_t){0})
 #define USER_DS 	((mm_segment_t){1})

--- a/arch/powerpc/include/asm/uaccess.h
+++ b/arch/powerpc/include/asm/uaccess.h
@ -11,9 +11,6 @@
 #include <asm/processor.h>
 #include <asm/page.h>

-#define VERIFY_READ	0
-#define VERIFY_WRITE	1
-
 /*
 * The fs value determines whether argument validity checking should be
 * performed or not.  If get_fs() == USER_DS, checking is performed, with
--- a/arch/s390/include/asm/uaccess.h
+++ b/arch/s390/include/asm/uaccess.h
@ -17,9 +17,6 @@
 #include <asm/processor.h>
 #include <asm/ctl_reg.h>

-#define VERIFY_READ     0
-#define VERIFY_WRITE    1
-

 /*
 * The fs value determines whether argument validity checking should be
--- a/arch/score/include/asm/uaccess.h
+++ b/arch/score/include/asm/uaccess.h
@ -6,9 +6,6 @@
 #include <linux/thread_info.h>
 #include <asm/extable.h>

-#define VERIFY_READ		0
-#define VERIFY_WRITE		1
-
 #define get_ds()		(KERNEL_DS)
 #define get_fs()		(current_thread_info()->addr_limit)
 #define segment_eq(a, b)	((a).seg == (b).seg)
--- a/arch/sh/include/asm/uaccess.h
+++ b/arch/sh/include/asm/uaccess.h
@ -5,9 +5,6 @@
 #include <linux/sched.h>
 #include <asm/segment.h>

-#define VERIFY_READ    0
-#define VERIFY_WRITE   1
-
 #define __addr_ok(addr) \
 	((unsigned long __force)(addr) < current_thread_info()->addr_limit.seg)

--- a/arch/sparc/include/asm/uaccess_32.h
+++ b/arch/sparc/include/asm/uaccess_32.h
@ -30,9 +30,6 @@
 #define KERNEL_DS   ((mm_segment_t) { 0 })
 #define USER_DS     ((mm_segment_t) { -1 })

-#define VERIFY_READ	0
-#define VERIFY_WRITE	1
-
 #define get_ds()	(KERNEL_DS)
 #define get_fs()	(current->thread.current_ds)
 #define set_fs(val)	((current->thread.current_ds) = (val))
--- a/arch/sparc/include/asm/uaccess_64.h
+++ b/arch/sparc/include/asm/uaccess_64.h
@ -36,9 +36,6 @@
 #define KERNEL_DS   ((mm_segment_t) { ASI_P })
 #define USER_DS     ((mm_segment_t) { ASI_AIUS })	/* har har har */

-#define VERIFY_READ	0
-#define VERIFY_WRITE	1
-
 #define get_fs() ((mm_segment_t){(current_thread_info()->current_ds)})
 #define get_ds() (KERNEL_DS)

--- a/arch/tile/include/asm/uaccess.h
+++ b/arch/tile/include/asm/uaccess.h
@ -24,9 +24,6 @@
 #include <asm/processor.h>
 #include <asm/page.h>

-#define VERIFY_READ	0
-#define VERIFY_WRITE	1
-
 /*
 * The fs value determines whether argument validity checking should be
 * performed or not.  If get_fs() == USER_DS, checking is performed, with
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
@ -13,9 +13,6 @@
 #include <asm/smap.h>
 #include <asm/extable.h>

-#define VERIFY_READ 0
-#define VERIFY_WRITE 1
-
 /*
 * The fs value determines whether argument validity checking should be
 * performed or not.  If get_fs() == USER_DS, checking is performed, with
--- a/arch/xtensa/include/asm/asm-uaccess.h
+++ b/arch/xtensa/include/asm/asm-uaccess.h
@ -19,9 +19,6 @@
 #include <linux/errno.h>
 #include <asm/types.h>

-#define VERIFY_READ    0
-#define VERIFY_WRITE   1
-
 #include <asm/current.h>
 #include <asm/asm-offsets.h>
 #include <asm/processor.h>
--- a/arch/xtensa/include/asm/uaccess.h
+++ b/arch/xtensa/include/asm/uaccess.h
@ -20,9 +20,6 @@
 #include <linux/prefetch.h>
 #include <asm/types.h>

-#define VERIFY_READ    0
-#define VERIFY_WRITE   1
-
 #include <linux/sched.h>

 /*
--- a/include/asm-generic/uaccess.h
+++ b/include/asm-generic/uaccess.h
@ -35,9 +35,6 @@ static inline void set_fs(mm_segment_t fs)
 #define segment_eq(a, b) ((a).seg == (b).seg)
 #endif

-#define VERIFY_READ	0
-#define VERIFY_WRITE	1
-
 #define access_ok(type, addr, size) __access_ok((unsigned long)(addr),(size))

 /*
--- a/include/linux/uaccess.h
+++ b/include/linux/uaccess.h
@ -2,6 +2,10 @@
 #define __LINUX_UACCESS_H__

 #include <linux/sched.h>
+
+#define VERIFY_READ 0
+#define VERIFY_WRITE 1
+
 #include <asm/uaccess.h>

 static __always_inline void pagefault_disabled_inc(void)