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>
This commit is contained in:
@@ -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 */
|
||||
|
@@ -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 */
|
||||
|
Reference in New Issue
Block a user