summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-12-27 18:19:09 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2017-03-05 21:57:58 -0500
commit444f02c458db00bd6049cc1bfe4254e80f57459e (patch)
tree921c8bc78c91946fc45e2f6facb17b7c1e487632 /arch/cris
parentaf1d5b37d6211c814fac0d5d0b71ec695618054a (diff)
downloadop-kernel-dev-444f02c458db00bd6049cc1bfe4254e80f57459e.zip
op-kernel-dev-444f02c458db00bd6049cc1bfe4254e80f57459e.tar.gz
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/cris')
-rw-r--r--arch/cris/include/asm/uaccess.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/cris/include/asm/uaccess.h b/arch/cris/include/asm/uaccess.h
index bb3004a..c2462ef 100644
--- a/arch/cris/include/asm/uaccess.h
+++ b/arch/cris/include/asm/uaccess.h
@@ -15,7 +15,6 @@
#ifndef _CRIS_UACCESS_H
#define _CRIS_UACCESS_H
-#ifndef __ASSEMBLY__
#include <asm/processor.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)
-#endif /* __ASSEMBLY__ */
-
#endif /* _CRIS_UACCESS_H */
OpenPOWER on IntegriCloud