fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / asm-x86_64 / mach-xen / asm / page.h

diff --git a/include/asm-x86_64/mach-xen/asm/page.h b/include/asm-x86_64/mach-xen/asm/page.h
index 8aba44c..7c15b3f 100644 (file)
--- a/include/asm-x86_64/mach-xen/asm/page.h
+++ b/include/asm-x86_64/mach-xen/asm/page.h
@@ -77,7 +77,6 @@ void copy_page(void *, void *);
 
 #define alloc_zeroed_user_highpage(vma, vaddr) alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO, vma, vaddr)
 #define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE
-
 /*
  * These are used to make use of C type-checking..
  */
@@ -145,7 +144,7 @@ static inline pgd_t __pgd(unsigned long x)
 #define __PHYSICAL_START       ((unsigned long)CONFIG_PHYSICAL_START)
 #define __START_KERNEL         (__START_KERNEL_map + __PHYSICAL_START)
 #define __START_KERNEL_map     0xffffffff80000000UL
-#define __PAGE_OFFSET           0xffff880000000000UL   
+#define __PAGE_OFFSET           0xffff880000000000UL
 
 #else
 #define __PHYSICAL_START       CONFIG_PHYSICAL_START
@@ -171,6 +170,12 @@ static inline pgd_t __pgd(unsigned long x)
 #define KERNEL_TEXT_SIZE  (40UL*1024*1024)
 #define KERNEL_TEXT_START 0xffffffff80000000UL 
 
+#ifndef __ASSEMBLY__
+
+#include <asm/bug.h>
+
+#endif /* __ASSEMBLY__ */
+
 #define PAGE_OFFSET            ((unsigned long)__PAGE_OFFSET)
 
 /* Note: __pa(&symbol_visible_to_c) should be always replaced with __pa_symbol.