android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uaccess: drop pointless ifdefs

Browse Source 
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>
This commit is contained in:
Al Viro 2016-12-27 18:19:09 -05:00
parent af1d5b37d6
commit 444f02c458
5 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/cris/include/asm/uaccess.h
View File

@ -15,7 +15,6 @@
#ifndef _CRIS_UACCESS_H #ifndef _CRIS_UACCESS_H
#define _CRIS_UACCESS_H #define _CRIS_UACCESS_H
#ifndef __ASSEMBLY__
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/page.h> #include <asm/page.h>
@ -411,6 +410,4 @@ __generic_clear_user_nocheck(void __user *to, unsigned long n)
#define strlen_user(str) strnlen_user((str), 0x7ffffffe) #define strlen_user(str) strnlen_user((str), 0x7ffffffe)
#endif /* __ASSEMBLY__ */
#endif /* _CRIS_UACCESS_H */ #endif /* _CRIS_UACCESS_H */

6
arch/microblaze/include/asm/uaccess.h
View File

@ -11,9 +11,6 @@
#ifndef _ASM_MICROBLAZE_UACCESS_H #ifndef _ASM_MICROBLAZE_UACCESS_H
#define _ASM_MICROBLAZE_UACCESS_H #define _ASM_MICROBLAZE_UACCESS_H
#ifdef __KERNEL__
#ifndef __ASSEMBLY__
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mm.h> #include <linux/mm.h>
@ -417,7 +414,4 @@ static inline long strnlen_user(const char __user *src, long n)
return __strnlen_user(src, n); return __strnlen_user(src, n);
} }
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* _ASM_MICROBLAZE_UACCESS_H */ #endif /* _ASM_MICROBLAZE_UACCESS_H */

6
arch/powerpc/include/asm/uaccess.h
View File

@ -1,9 +1,6 @@
#ifndef _ARCH_POWERPC_UACCESS_H #ifndef _ARCH_POWERPC_UACCESS_H
#define _ARCH_POWERPC_UACCESS_H #define _ARCH_POWERPC_UACCESS_H
#ifdef __KERNEL__
#ifndef __ASSEMBLY__
#include <asm/asm-compat.h> #include <asm/asm-compat.h>
#include <asm/ppc_asm.h> #include <asm/ppc_asm.h>
#include <asm/processor.h> #include <asm/processor.h>
@ -417,7 +414,4 @@ extern long strncpy_from_user(char *dst, const char __user *src, long count);
extern __must_check long strlen_user(const char __user *str); extern __must_check long strlen_user(const char __user *str);
extern __must_check long strnlen_user(const char __user *str, long n); extern __must_check long strnlen_user(const char __user *str, long n);
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* _ARCH_POWERPC_UACCESS_H */ #endif /* _ARCH_POWERPC_UACCESS_H */

6
arch/sparc/include/asm/uaccess_32.h
View File

@ -7,12 +7,8 @@
#ifndef _ASM_UACCESS_H #ifndef _ASM_UACCESS_H
#define _ASM_UACCESS_H #define _ASM_UACCESS_H
#ifdef __KERNEL__
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/string.h> #include <linux/string.h>
#endif
#ifndef __ASSEMBLY__
#include <asm/processor.h> #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 strlen_user(const char __user *str);
__must_check long strnlen_user(const char __user *str, long n); __must_check long strnlen_user(const char __user *str, long n);
#endif /* __ASSEMBLY__ */
#endif /* _ASM_UACCESS_H */ #endif /* _ASM_UACCESS_H */

6
arch/sparc/include/asm/uaccess_64.h
View File

@ -5,16 +5,12 @@
* User space memory access functions * User space memory access functions
*/ */
#ifdef __KERNEL__
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/string.h> #include <linux/string.h>
#include <asm/asi.h> #include <asm/asi.h>
#include <asm/spitfire.h> #include <asm/spitfire.h>
#include <asm-generic/uaccess-unaligned.h> #include <asm-generic/uaccess-unaligned.h>
#include <asm/extable_64.h> #include <asm/extable_64.h>
#endif
#ifndef __ASSEMBLY__
#include <asm/processor.h> #include <asm/processor.h>
@ -229,6 +225,4 @@ unsigned long compute_effective_address(struct pt_regs *,
unsigned int insn, unsigned int insn,
unsigned int rd); unsigned int rd);
#endif /* __ASSEMBLY__ */
#endif /* _ASM_UACCESS_H */ #endif /* _ASM_UACCESS_H */