summaryrefslogtreecommitdiffstats
path: root/include/asm-frv/page.h
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-02-01 14:08:45 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-02 01:17:05 +0100
commite7bc537db9e13adee1f294aa370f16d80f40b73d (patch)
tree23d7c8f6c66c197faa869055a6fc5e4edb3fa6ee /include/asm-frv/page.h
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-e7bc537db9e13adee1f294aa370f16d80f40b73d.tar.xz
linux-e7bc537db9e13adee1f294aa370f16d80f40b73d.zip
[PATCH] fix frv headers_check
a) registers.h is really needed there b) include of asm-generic/termios should be under __KERNEL__ c) includes of asm-generic/{memory_model,page} should be under __KERNEL (nothing in there that would work in userland) d) a lot of stuff in ptrace.h should be under __KERNEL__. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Acked-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-frv/page.h')
-rw-r--r--include/asm-frv/page.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-frv/page.h b/include/asm-frv/page.h
index 134cc0cdf6c2..213d92fd652a 100644
--- a/include/asm-frv/page.h
+++ b/include/asm-frv/page.h
@@ -76,8 +76,6 @@ extern unsigned long max_pfn;
#endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
-
#ifdef CONFIG_CONTIGUOUS_PAGE_ALLOC
#define WANT_PAGE_VIRTUAL 1
#endif
@@ -85,4 +83,6 @@ extern unsigned long max_pfn;
#include <asm-generic/memory_model.h>
#include <asm-generic/page.h>
+#endif /* __KERNEL__ */
+
#endif /* _ASM_PAGE_H */