Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / page_64.h

diff --git a/include/asm-powerpc/page_64.h b/include/asm-powerpc/page_64.h
index 6642c012500177fc5e6f90a6ddf84e0cfa2e5ec5..3fb061bab9ecd75f0fc912d23fc7cbb71f5c45c7 100644 (file)
--- a/include/asm-powerpc/page_64.h
+++ b/include/asm-powerpc/page_64.h
@@ -1,5 +1,6 @@
 #ifndef _ASM_POWERPC_PAGE_64_H
 #define _ASM_POWERPC_PAGE_64_H
+#ifdef __KERNEL__
 
 /*
  * Copyright (C) 2001 PPC64 Team, IBM Corp
@@ -25,16 +26,6 @@
  */
 #define PAGE_FACTOR            (PAGE_SHIFT - HW_PAGE_SHIFT)
 
-#define REGION_SIZE   4UL
-#define REGION_SHIFT  60UL
-#define REGION_MASK   (((1UL<<REGION_SIZE)-1UL)<<REGION_SHIFT)
-
-#define VMALLOCBASE            ASM_CONST(0xD000000000000000)
-#define VMALLOC_REGION_ID      (VMALLOCBASE >> REGION_SHIFT)
-#define KERNEL_REGION_ID       (KERNELBASE >> REGION_SHIFT)
-#define USER_REGION_ID         (0UL)
-#define REGION_ID(ea)          (((unsigned long)(ea)) >> REGION_SHIFT)
-
 /* Segment size */
 #define SID_SHIFT              28
 #define SID_MASK               0xfffffffffUL
@@ -180,4 +171,5 @@ extern unsigned int HPAGE_SHIFT;
 
 #include <asm-generic/page.h>
 
+#endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_PAGE_64_H */