From b1699c223aa8571e2ebd11fad8406140a360cf53 Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew@wil.cx>
Date: Mon, 18 Sep 2006 20:12:27 -0700
Subject: [PATCH] --- yaml --- r: 33983 b: refs/heads/master c:
 ac7fb273ca1d0b4fb354575bb6e101ffd09e0b54 h: refs/heads/master i:   33981:
 1ee705ce51114790fd452391cf83ee430c49bc51   33979:
 b8043c4d0f734f1c7ae4ff9c7383dcf059e20e3c   33975:
 7384516f026bd33c5682445f14bda1a537f43ee0   33967:
 c15be41e92b64331e1ea39617d5990bbcf2e2ef2   33951:
 4aae9354a68bb31caf4b8f443b71e2bca2008e55   33919:
 2e0e7896ed9f8e51c6a3b4bfeaff527f1b4dd189 v: v3

---
 [refs]                          |  2 +-
 trunk/include/asm-parisc/page.h | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 7b82a1656ea0..b3b94166fa3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 020d8c063b4d850b53dfbaee843c8335b7a90d26
+refs/heads/master: ac7fb273ca1d0b4fb354575bb6e101ffd09e0b54
diff --git a/trunk/include/asm-parisc/page.h b/trunk/include/asm-parisc/page.h
index 0695bc958d56..57d6d82756dd 100644
--- a/trunk/include/asm-parisc/page.h
+++ b/trunk/include/asm-parisc/page.h
@@ -1,22 +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__
 
 #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
@@ -188,9 +180,9 @@ extern int npmem_ranges;
 #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
 				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
 
-#endif /* __KERNEL__ */
-
 #include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
 
+#endif /* __KERNEL__ */
+
 #endif /* _PARISC_PAGE_H */