diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-12-27 18:19:09 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-03-05 21:57:58 -0500 |
| commit | 444f02c458db00bd6049cc1bfe4254e80f57459e (patch) | |
| tree | 921c8bc78c91946fc45e2f6facb17b7c1e487632 /arch/sparc | |
| parent | af1d5b37d6211c814fac0d5d0b71ec695618054a (diff) | |
uaccess: drop pointless ifdefs
None of those file is ever included from uapi stuff, so __KERNEL__
is always defined. None of them is ever included from assembler
(they are only pulled from linux/uaccess.h, which _can't_ be
included from assembler), so __ASSEMBLY__ is never defined.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/include/asm/uaccess_32.h | 6 | ||||
| -rw-r--r-- | arch/sparc/include/asm/uaccess_64.h | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h index b10f7d626f0e..952d512a64f2 100644 --- a/arch/sparc/include/asm/uaccess_32.h +++ b/arch/sparc/include/asm/uaccess_32.h @@ -7,12 +7,8 @@ #ifndef _ASM_UACCESS_H #define _ASM_UACCESS_H -#ifdef __KERNEL__ #include <linux/compiler.h> #include <linux/string.h> -#endif - -#ifndef __ASSEMBLY__ #include <asm/processor.h> @@ -307,6 +303,4 @@ static inline unsigned long clear_user(void __user *addr, unsigned long n) __must_check long strlen_user(const char __user *str); __must_check long strnlen_user(const char __user *str, long n); -#endif /* __ASSEMBLY__ */ - #endif /* _ASM_UACCESS_H */ diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h index d76362cad80f..7afb4f64553f 100644 --- a/arch/sparc/include/asm/uaccess_64.h +++ b/arch/sparc/include/asm/uaccess_64.h @@ -5,16 +5,12 @@ * User space memory access functions */ -#ifdef __KERNEL__ #include <linux/compiler.h> #include <linux/string.h> #include <asm/asi.h> #include <asm/spitfire.h> #include <asm-generic/uaccess-unaligned.h> #include <asm/extable_64.h> -#endif - -#ifndef __ASSEMBLY__ #include <asm/processor.h> @@ -229,6 +225,4 @@ unsigned long compute_effective_address(struct pt_regs *, unsigned int insn, unsigned int rd); -#endif /* __ASSEMBLY__ */ - #endif /* _ASM_UACCESS_H */ |