uaccess-remove-segment_eq.patch removed from -mm tree
The patch titled
Subject: uaccess: remove segment_eq
has been removed from the -mm tree. Its filename was
uaccess-remove-segment_eq.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Christoph Hellwig <[email protected]>
Subject: uaccess: remove segment_eq
segment_eq is only used to implement uaccess_kernel. Just open code uaccess_kernel in the arch uaccess headers and remove one layer of indirection.
Signed-off-by Christoph Hellwig <[email protected]>
Acked-by Linus Torvalds <[email protected]>
Acked-by Greentime Hu <[email protected]>
Cc Nick Hu <[email protected]>
Cc Vincent Chen <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/alpha/include/asm/uaccess.h | 2 +- arch/arc/include/asm/segment.h | 3 +-- arch/arm/include/asm/uaccess.h | 4 ++-- arch/arm64/include/asm/uaccess.h | 2 +- arch/csky/include/asm/segment.h | 2 +- arch/h8300/include/asm/segment.h | 2 +- arch/ia64/include/asm/uaccess.h | 2 +- arch/m68k/include/asm/segment.h | 2 +- arch/microblaze/include/asm/uaccess.h | 2 +- arch/mips/include/asm/uaccess.h | 2 +- arch/nds32/include/asm/uaccess.h | 2 +- arch/nios2/include/asm/uaccess.h | 2 +- arch/openrisc/include/asm/uaccess.h | 2 +- arch/parisc/include/asm/uaccess.h | 2 +- arch/powerpc/include/asm/uaccess.h | 3 +-- arch/riscv/include/asm/uaccess.h | 4 +--- arch/s390/include/asm/uaccess.h | 2 +- arch/sh/include/asm/segment.h | 3 +-- arch/sparc/include/asm/uaccess_32.h | 2 +- arch/sparc/include/asm/uaccess_64.h | 2 +- arch/x86/include/asm/uaccess.h | 2 +- arch/xtensa/include/asm/uaccess.h | 2 +- include/asm-generic/uaccess.h | 4 ++-- include/linux/uaccess.h | 2 -- 24 files changed, 25 insertions(+), 32 deletions(-)
arch/alpha/include/asm/uaccess.h renamed from arch/alpha/include/asm/uaccess.h~uaccess-remove-segment_eq +1 -1
@@ -20,7 +20,7 @@#define get_fs () (current_thread_info()->addr_limit)#define set_fs (x) (current_thread_info()->addr_limit = (x)) -#define segment_eq (a, b) ((a).seg == (b).seg) +#define uaccess_kernel () (get_fs().seg == KERNEL_DS.seg)/* * Is a address valid? This does a straightforward calculation rather
arch/arc/include/asm/segment.h renamed from arch/arc/include/asm/segment.h~uaccess-remove-segment_eq +1 -2
@@ -14,8 +14,7 @@ typedef unsigned long mm_segment_t;#define KERNEL_DS MAKE_MM_SEG(0)#define USER_DS MAKE_MM_SEG(TASK_SIZE) - -#define segment_eq (a, b) ((a) == (b)) +#define uaccess_kernel () (get_fs() == KERNEL_DS)#endif /* __ASSEMBLY__ */ #endif /* __ASMARC_SEGMENT_H */
arch/arm64/include/asm/uaccess.h renamed from arch/arm64/include/asm/uaccess.h~uaccess-remove-segment_eq +1 -1
@@ -50,7 +50,7 @@ static inline void set_fs(mm_segment_t f CONFIG_ARM64_UAO)); } -#define segment_eq (a, b) ((a) == (b)) +#define uaccess_kernel () (get_fs() == KERNEL_DS)/* * Test whether a block of memory is a valid user space address.
arch/arm/include/asm/uaccess.h renamed from arch/arm/include/asm/uaccess.h~uaccess-remove-segment_eq +2 -2
@@ -76,7 +76,7 @@ static inline void set_fs(mm_segment_t fmodify_domain (DOMAIN_KERNEL , fs ?DOMAIN_CLIENT :DOMAIN_MANAGER ); } -#define segment_eq (a, b) ((a) == (b)) +#define uaccess_kernel () (get_fs() == KERNEL_DS)/* * We use 33-bit arithmetic here. Success returns zero, failure returns
@@ -267,7 +267,7 @@ extern int __put_user_8(void *, unsigned*/ #define USER_DS KERNEL_DS -#define segment_eq (a, b) (1) +#define uaccess_kernel () (true)#define __addr_ok (addr) ((void)(addr), 1)#define __range_ok (addr, size) ((void)(addr), 0)#define get_fs () (KERNEL_DS)
arch/csky/include/asm/segment.h renamed from arch/csky/include/asm/segment.h~uaccess-remove-segment_eq +1 -1
@@ -13,6 +13,6 @@ typedef struct {#define USER_DS ((mm_segment_t) { 0x80000000UL })#define get_fs () (current_thread_info()->addr_limit)#define set_fs (x) (current_thread_info()->addr_limit = (x)) -#define segment_eq (a, b) ((a).seg == (b).seg) +#define uaccess_kernel () (get_fs().seg == KERNEL_DS.seg)#endif /* __ASM_CSKY_SEGMENT_H */
arch/h8300/include/asm/segment.h renamed from arch/h8300/include/asm/segment.h~uaccess-remove-segment_eq +1 -1
@@ -33,7 +33,7 @@ static inline mm_segment_t get_fs(void) return USER_DS; } -#define segment_eq (a, b) ((a).seg == (b).seg) +#define uaccess_kernel () (get_fs().seg == KERNEL_DS.seg)#endif /* __ASSEMBLY__ */
arch/ia64/include/asm/uaccess.h renamed from arch/ia64/include/asm/uaccess.h~uaccess-remove-segment_eq +1 -1
@@ -50,7 +50,7 @@#define get_fs () (current_thread_info()->addr_limit)#define set_fs (x) (current_thread_info()->addr_limit = (x)) -#define segment_eq (a, b) ((a).seg == (b).seg) +#define uaccess_kernel () (get_fs().seg == KERNEL_DS.seg)/* * When accessing user memory, we need to make sure the entire area really is in
arch/m68k/include/asm/segment.h renamed from arch/m68k/include/asm/segment.h~uaccess-remove-segment_eq +1 -1
@@ -52,7 +52,7 @@ static inline void set_fs(mm_segment_t v#define set_fs (x) (current_thread_info()->addr_limit = (x))#endif -#define segment_eq (a, b) ((a).seg == (b).seg) +#define uaccess_kernel () (get_fs().seg == KERNEL_DS.seg)#endif /* __ASSEMBLY__ */
arch/microblaze/include/asm/uaccess.h renamed from arch/microblaze/include/asm/uaccess.h~uaccess-remove-segment_eq +1 -1
@@ -41,7 +41,7 @@# define get_fs () (current_thread_info()->addr_limit)# define set_fs (val) (current_thread_info()->addr_limit = (val)) -# define segment_eq (a, b) ((a).seg == (b).seg) +# define uaccess_kernel () (get_fs().seg == KERNEL_DS.seg)#ifndef CONFIG_MMU
arch/mips/include/asm/uaccess.h renamed from arch/mips/include/asm/uaccess.h~uaccess-remove-segment_eq +1 -1
@@ -72,7 +72,7 @@ extern u64 __ua_limit;#define get_fs () (current_thread_info()->addr_limit)#define set_fs (x) (current_thread_info()->addr_limit = (x)) -#define segment_eq (a, b) ((a).seg == (b).seg) +#define uaccess_kernel () (get_fs().seg == KERNEL_DS.seg)/* * eva_kernel_access() - determine whether kernel memory access on an EVA system
arch/nds32/include/asm/uaccess.h renamed from arch/nds32/include/asm/uaccess.h~uaccess-remove-segment_eq +1 -1
@@ -44,7 +44,7 @@ static inline void set_fs(mm_segment_t fcurrent_thread_info ()->addr_limit = fs; } -#define segment_eq (a, b) ((a) == (b)) +#define uaccess_kernel () (get_fs() == KERNEL_DS)#define __range_ok (addr, size) (size <= get_fs() && addr <= (get_fs() -size))
arch/nios2/include/asm/uaccess.h renamed from arch/nios2/include/asm/uaccess.h~uaccess-remove-segment_eq +1 -1
@@ -30,7 +30,7 @@#define get_fs () (current_thread_info()->addr_limit)#define set_fs (seg) (current_thread_info()->addr_limit = (seg)) -#define segment_eq (a, b) ((a).seg == (b).seg) +#define uaccess_kernel () (get_fs().seg == KERNEL_DS.seg)#define __access_ok (addr, len) \ (((signed long)(((long)get_fs().seg) & \
arch/openrisc/include/asm/uaccess.h renamed from arch/openrisc/include/asm/uaccess.h~uaccess-remove-segment_eq +1 -1
@@ -43,7 +43,7 @@#define get_fs () (current_thread_info()->addr_limit)#define set_fs (x) (current_thread_info()->addr_limit = (x)) -#define segment_eq (a, b) ((a) == (b)) +#define uaccess_kernel () (get_fs() == KERNEL_DS)/* Ensure that the range from addr to addr+size is all within the process' * address space
arch/parisc/include/asm/uaccess.h renamed from arch/parisc/include/asm/uaccess.h~uaccess-remove-segment_eq +1 -1
@@ -14,7 +14,7 @@#define KERNEL_DS ((mm_segment_t){0})#define USER_DS ((mm_segment_t){1}) -#define segment_eq (a, b) ((a).seg == (b).seg) +#define uaccess_kernel () (get_fs().seg == KERNEL_DS.seg)#define get_fs () (current_thread_info()->addr_limit)#define set_fs (x) (current_thread_info()->addr_limit = (x))
arch/powerpc/include/asm/uaccess.h renamed from arch/powerpc/include/asm/uaccess.h~uaccess-remove-segment_eq +1 -2
@@ -38,8 +38,7 @@ static inline void set_fs(mm_segment_t fset_thread_flag (TIF_FSCHECK ); } -#define segment_eq (a, b) ((a).seg == (b).seg) - +#define uaccess_kernel () (get_fs().seg == KERNEL_DS.seg)#define user_addr_max () (get_fs().seg)#ifdef __powerpc64__
arch/riscv/include/asm/uaccess.h renamed from arch/riscv/include/asm/uaccess.h~uaccess-remove-segment_eq +1 -3
@@ -64,11 +64,9 @@ static inline void set_fs(mm_segment_t fcurrent_thread_info ()->addr_limit = fs; } -#define segment_eq (a, b) ((a).seg == (b).seg) - +#define uaccess_kernel () (get_fs().seg == KERNEL_DS.seg)#define user_addr_max () (get_fs().seg) -/** * access_ok: - Checks if a user space pointer is valid * @addr: User space pointer to start of block to check
arch/s390/include/asm/uaccess.h renamed from arch/s390/include/asm/uaccess.h~uaccess-remove-segment_eq +1 -1
@@ -32,7 +32,7 @@#define USER_DS_SACF (3)#define get_fs () (current->thread.mm_segment) -#define segment_eq (a,b) (((a) & 2) == ((b) & 2)) +#define uaccess_kernel () ((get_fs() & 2) == KERNEL_DS)void set_fs (mm_segment_t fs);
arch/sh/include/asm/segment.h renamed from arch/sh/include/asm/segment.h~uaccess-remove-segment_eq +1 -2
@@ -24,8 +24,7 @@ typedef struct {#define USER_DS KERNEL_DS#endif -#define segment_eq (a, b) ((a).seg == (b).seg) - +#define uaccess_kernel () (get_fs().seg == KERNEL_DS.seg)#define get_fs () (current_thread_info()->addr_limit)#define set_fs (x) (current_thread_info()->addr_limit = (x))
arch/sparc/include/asm/uaccess_32.h renamed from arch/sparc/include/asm/uaccess_32.h~uaccess-remove-segment_eq +1 -1
@@ -28,7 +28,7 @@#define get_fs () (current->thread.current_ds)#define set_fs (val) ((current->thread.current_ds) = (val)) -#define segment_eq (a, b) ((a).seg == (b).seg) +#define uaccess_kernel () (get_fs().seg == KERNEL_DS.seg)/* We have there a nice not-mapped page at PAGE_OFFSET - PAGE_SIZE, so that this test * can be fairly lightweight.
arch/sparc/include/asm/uaccess_64.h renamed from arch/sparc/include/asm/uaccess_64.h~uaccess-remove-segment_eq +1 -1
@@ -32,7 +32,7 @@#define get_fs () ((mm_segment_t){(current_thread_info()->current_ds)}) -#define segment_eq (a, b) ((a).seg == (b).seg) +#define uaccess_kernel () (get_fs().seg == KERNEL_DS.seg)#define set_fs (val) \ do { \
arch/x86/include/asm/uaccess.h renamed from arch/x86/include/asm/uaccess.h~uaccess-remove-segment_eq +1 -1
@@ -33,7 +33,7 @@ static inline void set_fs(mm_segment_t fset_thread_flag (TIF_FSCHECK ); } -#define segment_eq (a, b) ((a).seg == (b).seg) +#define uaccess_kernel () (get_fs().seg == KERNEL_DS.seg)#define user_addr_max () (current->thread.addr_limit.seg)/*
arch/xtensa/include/asm/uaccess.h renamed from arch/xtensa/include/asm/uaccess.h~uaccess-remove-segment_eq +1 -1
@@ -35,7 +35,7 @@#define get_fs () (current->thread.current_ds)#define set_fs (val) (current->thread.current_ds = (val)) -#define segment_eq (a, b) ((a).seg == (b).seg) +#define uaccess_kernel () (get_fs().seg == KERNEL_DS.seg)#define __kernel_ok (uaccess_kernel())#define __user_ok (addr, size) \
include/asm-generic/uaccess.h renamed from include/asm-generic/uaccess.h~uaccess-remove-segment_eq +2 -2
@@ -86,8 +86,8 @@ static inline void set_fs(mm_segment_t f }#endif -#ifndef segment_eq -#define segment_eq (a, b) ((a).seg == (b).seg) +#ifndef uaccess_kernel +#define uaccess_kernel () (get_fs().seg == KERNEL_DS.seg)#endif #define access_ok (addr, size) __access_ok((unsigned long)(addr),(size))
include/linux/uaccess.h renamed from include/linux/uaccess.h~uaccess-remove-segment_eq +0 -2
@@ -6,8 +6,6 @@#include <linux/sched.h> #include <linux/thread_info.h> -#define uaccess_kernel () segment_eq(get_fs(), KERNEL_DS) -#include <asm/uaccess.h> /*
_
Patches currently in -mm which might be from [email protected] are