X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-parisc%2Fpage.h;h=a3f24a6e90d0bc102f8e320b98b3dcca42260866;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=fcae97e6a8ccf067558af93e5af13facddb961c0;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/include/asm-parisc/page.h b/include/asm-parisc/page.h
index fcae97e6a..a3f24a6e9 100644
--- a/include/asm-parisc/page.h
+++ b/include/asm-parisc/page.h
@@ -1,14 +1,23 @@
 #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
+# define PAGE_SHIFT	12	/* 4k */
 #elif defined(CONFIG_PARISC_PAGE_SIZE_16KB)
-# define PAGE_SHIFT	14
+# define PAGE_SHIFT	14	/* 16k */
 #elif defined(CONFIG_PARISC_PAGE_SIZE_64KB)
-# define PAGE_SHIFT	16
+# define PAGE_SHIFT	16	/* 64k */
 #else
 # error "unknown default kernel page size"
 #endif
@@ -180,11 +189,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 */