Merge git://git.infradead.org/~dedekind/ubi-2.6

[linux-2.6] / include / asm-x86 / setup.h

diff --git a/include/asm-x86/setup.h b/include/asm-x86/setup.h
index 7e5698f7d24291c7a5b194c8e7675d90f9ebbedb..071e054abd82f91eb68eb96c37d7c41cf4e76299 100644 (file)
--- a/include/asm-x86/setup.h
+++ b/include/asm-x86/setup.h
@@ -3,6 +3,13 @@
 
 #define COMMAND_LINE_SIZE 2048
 
+#ifndef __ASSEMBLY__
+char *machine_specific_memory_setup(void);
+#ifndef CONFIG_PARAVIRT
+#define paravirt_post_allocator_init() do {} while (0)
+#endif
+#endif /* __ASSEMBLY__ */
+
 #ifdef __KERNEL__
 
 #ifdef __i386__
@@ -14,19 +21,19 @@
 #define MAXMEM_PFN     PFN_DOWN(MAXMEM)
 #define MAX_NONPAE_PFN (1 << 20)
 
-#define PARAM_SIZE 4096
+#endif /* __i386__ */
+
+#define PARAM_SIZE 4096                /* sizeof(struct boot_params) */
 
-#define OLD_CL_MAGIC_ADDR      0x90020
 #define OLD_CL_MAGIC           0xA33F
-#define OLD_CL_BASE_ADDR       0x90000
-#define OLD_CL_OFFSET          0x90022
+#define OLD_CL_ADDRESS         0x020   /* Relative to real mode data */
 #define NEW_CL_POINTER         0x228   /* Relative to real mode data */
 
-#endif /* __i386__ */
-
 #ifndef __ASSEMBLY__
 #include <asm/bootparam.h>
 
+#ifndef _SETUP
+
 /*
  * This is set up by the setup-routine at boot-time
  */
@@ -51,11 +58,10 @@ void __init add_memory_region(unsigned long long start,
 
 extern unsigned long init_pg_tables_end;
 
-#ifndef CONFIG_PARAVIRT
-#define paravirt_post_allocator_init() do {} while (0)
-#endif
+
 
 #endif /* __i386__ */
+#endif /* _SETUP */
 #endif /* __ASSEMBLY__ */
 #endif  /*  __KERNEL__  */