From 08435d89dd5890c3e72dbdc0f47e7b06f0012447 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 3 Sep 2016 17:07:08 -0400 Subject: frv: move HAVE_ARCH_UNMAPPED_AREA to pgtable.h it has no business in uaccess.h, everything else has it in pgtable.h and the only user (mm/mmap.c) unconditionally pulls asm/pgtable.h via linux/mm.h. Signed-off-by: Al Viro --- arch/frv/include/asm/pgtable.h | 1 + arch/frv/include/asm/uaccess.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/frv') diff --git a/arch/frv/include/asm/pgtable.h b/arch/frv/include/asm/pgtable.h index 07d7a7ef8bd5..a0513d463a1f 100644 --- a/arch/frv/include/asm/pgtable.h +++ b/arch/frv/include/asm/pgtable.h @@ -522,5 +522,6 @@ extern void __init pgtable_cache_init(void); #ifndef __ASSEMBLY__ extern void __init paging_init(void); #endif /* !__ASSEMBLY__ */ +#define HAVE_ARCH_UNMAPPED_AREA #endif /* _ASM_PGTABLE_H */ diff --git a/arch/frv/include/asm/uaccess.h b/arch/frv/include/asm/uaccess.h index 87d9e34c5df8..c0f4057eab60 100644 --- a/arch/frv/include/asm/uaccess.h +++ b/arch/frv/include/asm/uaccess.h @@ -20,8 +20,6 @@ #include #include -#define HAVE_ARCH_UNMAPPED_AREA /* we decide where to put mmaps */ - #define __ptr(x) ((unsigned long __force *)(x)) #define VERIFY_READ 0 -- cgit v1.2.3 From 93b5097fe5b47d536b560fce14f4def3d1866121 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 3 Sep 2016 18:23:48 -0400 Subject: kill __kernel_ds_p off Signed-off-by: Al Viro --- arch/frv/include/asm/segment.h | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/frv') diff --git a/arch/frv/include/asm/segment.h b/arch/frv/include/asm/segment.h index 4377c89a57f5..2305142d4cf8 100644 --- a/arch/frv/include/asm/segment.h +++ b/arch/frv/include/asm/segment.h @@ -32,7 +32,6 @@ typedef struct { #define get_ds() (KERNEL_DS) #define get_fs() (__current_thread_info->addr_limit) #define segment_eq(a, b) ((a).seg == (b).seg) -#define __kernel_ds_p() segment_eq(get_fs(), KERNEL_DS) #define get_addr_limit() (get_fs().seg) #define set_fs(_x) \ -- cgit v1.2.3