aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-cris
diff options
context:
space:
mode:
authorKirill A. Shutemov <k.shutemov@gmail.com>2008-02-07 03:15:54 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 11:42:30 -0500
commit516c25a86f6bdad77ded01a43c52c5569c8d690c (patch)
treee7404e73fd103f70958ccb1bc1c74ff1c7ff48bf /include/asm-cris
parentc1445db9f72db0537c43a2eab6e1b0f6741162f5 (diff)
Cleanup asm/{elf,page,user}.h: #ifdef __KERNEL__ is no longer needed
asm/elf.h, asm/page.h and asm/user.h don't export to userspace now, so we can drop #ifdef __KERNEL__ for them. [k.shutemov@gmail.com: remove #ifdef __KERNEL_] Signed-off-by: Kirill A. Shutemov <k.shutemov@gmail.com> Reviewed-by: David Woodhouse <dwmw2@infradead.org> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Kirill A. Shutemov <k.shutemov@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-cris')
-rw-r--r--include/asm-cris/elf.h3
-rw-r--r--include/asm-cris/page.h4
2 files changed, 0 insertions, 7 deletions
diff --git a/include/asm-cris/elf.h b/include/asm-cris/elf.h
index 96a40c1de57c..001f64ad11e8 100644
--- a/include/asm-cris/elf.h
+++ b/include/asm-cris/elf.h
@@ -45,7 +45,6 @@ typedef unsigned long elf_fpregset_t;
45#define ELF_DATA ELFDATA2LSB 45#define ELF_DATA ELFDATA2LSB
46#define ELF_ARCH EM_CRIS 46#define ELF_ARCH EM_CRIS
47 47
48#ifdef __KERNEL__
49#include <asm/arch/elf.h> 48#include <asm/arch/elf.h>
50 49
51/* The master for these definitions is {binutils}/include/elf/cris.h: */ 50/* The master for these definitions is {binutils}/include/elf/cris.h: */
@@ -91,6 +90,4 @@ typedef unsigned long elf_fpregset_t;
91 90
92#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) 91#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
93 92
94#endif /* __KERNEL__ */
95
96#endif 93#endif
diff --git a/include/asm-cris/page.h b/include/asm-cris/page.h
index b84353ef6998..3b0156c46311 100644
--- a/include/asm-cris/page.h
+++ b/include/asm-cris/page.h
@@ -1,8 +1,6 @@
1#ifndef _CRIS_PAGE_H 1#ifndef _CRIS_PAGE_H
2#define _CRIS_PAGE_H 2#define _CRIS_PAGE_H
3 3
4#ifdef __KERNEL__
5
6#include <asm/arch/page.h> 4#include <asm/arch/page.h>
7#include <linux/const.h> 5#include <linux/const.h>
8 6
@@ -74,7 +72,5 @@ typedef struct { unsigned long pgprot; } pgprot_t;
74#include <asm-generic/memory_model.h> 72#include <asm-generic/memory_model.h>
75#include <asm-generic/page.h> 73#include <asm-generic/page.h>
76 74
77#endif /* __KERNEL__ */
78
79#endif /* _CRIS_PAGE_H */ 75#endif /* _CRIS_PAGE_H */
80 76