Merge to Fedora Core 2 kernel-2.6.8-1.521

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

diff --git a/include/asm-i386/processor.h b/include/asm-i386/processor.h
index f42af69..cd8708b 100644 (file)
--- a/include/asm-i386/processor.h
+++ b/include/asm-i386/processor.h
@@ -291,13 +291,10 @@ extern unsigned int mca_pentium_flag;
  */
 #define TASK_UNMAPPED_BASE     PAGE_ALIGN(TASK_SIZE/3)
 
-#define SHLIB_BASE             0x00111000
- 
 #define __HAVE_ARCH_ALIGN_STACK
 extern unsigned long arch_align_stack(unsigned long sp);
 
-#define __HAVE_ARCH_MMAP_TOP
-extern unsigned long mmap_top(void);
+#define HAVE_ARCH_PICK_MMAP_LAYOUT
 
 /*
  * Size of io_bitmap, covering ports 0 to 0x3ff.