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-parisc / page.h

diff --git a/include/asm-parisc/page.h b/include/asm-parisc/page.h
index a3f24a6..fcae97e 100644 (file)
--- a/include/asm-parisc/page.h
+++ b/include/asm-parisc/page.h
@@ -1,23 +1,14 @@
 #ifndef _PARISC_PAGE_H
 #define _PARISC_PAGE_H
 
-#if !defined(__KERNEL__)
-/* this is for userspace applications (4k page size) */
-# define PAGE_SHIFT    12      /* 4k */
-# define PAGE_SIZE     (1UL << PAGE_SHIFT)
-# define PAGE_MASK     (~(PAGE_SIZE-1))
-#endif
-
-
 #ifdef __KERNEL__
-#include <linux/config.h>
 
 #if defined(CONFIG_PARISC_PAGE_SIZE_4KB)
-# define PAGE_SHIFT    12      /* 4k */
+# define PAGE_SHIFT    12
 #elif defined(CONFIG_PARISC_PAGE_SIZE_16KB)
-# define PAGE_SHIFT    14      /* 16k */
+# define PAGE_SHIFT    14
 #elif defined(CONFIG_PARISC_PAGE_SIZE_64KB)
-# define PAGE_SHIFT    16      /* 64k */
+# define PAGE_SHIFT    16
 #else
 # error "unknown default kernel page size"
 #endif
@@ -189,11 +180,11 @@ extern int npmem_ranges;
 #define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
 
+#include <asm-generic/memory_model.h>
+#include <asm-generic/page.h>
+
 #define devmem_is_allowed(x) 1
 
 #endif /* __KERNEL__ */
 
-#include <asm-generic/memory_model.h>
-#include <asm-generic/page.h>
-
 #endif /* _PARISC_PAGE_H */