aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-10-23 22:37:25 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-23 22:37:25 +0200
commitfa76dab935b856871024530ec818bc0a8f88a016 (patch)
tree8d8a83d01d35a7b8d3559e75931e50c3f0f7723c /include
parent0de80bcc2baed116a569c38cbc38c5dcb945d14d (diff)
x86: clean up setup.h and the boot code
Make <asm/setup.h> usable by the boot code. Clean up vestiges of the old command-line protocol from setup.h and head_32.S (it is still supported from the boot loader point of view, since it is converted to the new command-line protocol by the boot code.) Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/setup.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/include/asm-x86/setup.h b/include/asm-x86/setup.h
index 7e5698f7d24..24d786e07b4 100644
--- a/include/asm-x86/setup.h
+++ b/include/asm-x86/setup.h
@@ -14,19 +14,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
*/
@@ -56,6 +56,7 @@ extern unsigned long init_pg_tables_end;
#endif
#endif /* __i386__ */
+#endif /* _SETUP */
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */