git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-m68k
/
page.h
diff --git
a/include/asm-m68k/page.h
b/include/asm-m68k/page.h
index
3725c9b
..
f4c883b
100644
(file)
--- a/
include/asm-m68k/page.h
+++ b/
include/asm-m68k/page.h
@@
-1,7
+1,8
@@
#ifndef _M68K_PAGE_H
#define _M68K_PAGE_H
#ifndef _M68K_PAGE_H
#define _M68K_PAGE_H
-#include <linux/config.h>
+
+#ifdef __KERNEL__
/* PAGE_SHIFT determines the page size */
#ifndef CONFIG_SUN3
/* PAGE_SHIFT determines the page size */
#ifndef CONFIG_SUN3
@@
-16,8
+17,6
@@
#endif
#define PAGE_MASK (~(PAGE_SIZE-1))
#endif
#define PAGE_MASK (~(PAGE_SIZE-1))
-#ifdef __KERNEL__
-
#include <asm/setup.h>
#if PAGE_SHIFT < 13
#include <asm/setup.h>
#if PAGE_SHIFT < 13
@@
-176,10
+175,10
@@
static inline void *__va(unsigned long x)
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+#include <asm-generic/page.h>
+
#define devmem_is_allowed(x) 1
#endif /* __KERNEL__ */
#define devmem_is_allowed(x) 1
#endif /* __KERNEL__ */
-#include <asm-generic/page.h>
-
#endif /* _M68K_PAGE_H */
#endif /* _M68K_PAGE_H */