Merge to Fedora Core 2 kernel-2.6.8-1.521

[linux-2.6.git] / include / asm-x86_64 / processor.h

diff --git a/include/asm-x86_64/processor.h b/include/asm-x86_64/processor.h
index ec696b2..597df19 100644 (file)
--- a/include/asm-x86_64/processor.h
+++ b/include/asm-x86_64/processor.h
@@ -163,10 +163,6 @@ static inline void clear_in_cr4 (unsigned long mask)
 #define MCA_bus__is_a_macro
 
 
-/*
- * User space process size: 512GB - 1GB (default).
- */
-#define TASK_SIZE      (0x0000007fc0000000UL)
 
 /* This decides where the kernel will search for a free chunk of vm
  * space during mmap's.
@@ -177,6 +173,14 @@ static inline void clear_in_cr4 (unsigned long mask)
 #define TASK_UNMAPPED_BASE     \
        (test_thread_flag(TIF_IA32) ? TASK_UNMAPPED_32 : TASK_UNMAPPED_64)  
 
+
+/*
+ * User space process size: 512GB - 1GB (default).
+ */
+#define TASK_SIZE_64   (0x0000007fc0000000UL)
+
+#define TASK_SIZE (test_thread_flag(TIF_IA32) ? IA32_PAGE_OFFSET : TASK_SIZE_64)
+
 /*
  * Size of io_bitmap, covering ports 0 to 0x3ff.
  */
@@ -461,4 +465,6 @@ static inline void __mwait(unsigned long eax, unsigned long ecx)
 #define ARCH_HAS_SCHED_WAKE_IDLE
 #endif
 
+#define HAVE_ARCH_PICK_MMAP_LAYOUT
+
 #endif /* __ASM_X86_64_PROCESSOR_H */