aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/setup.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-10-23 16:37:25 -0400
committerThomas Gleixner <tglx@linutronix.de>2007-10-23 16:37:25 -0400
commitfa76dab935b856871024530ec818bc0a8f88a016 (patch)
tree8d8a83d01d35a7b8d3559e75931e50c3f0f7723c /include/asm-x86/setup.h
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/asm-x86/setup.h')
-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 7e5698f7d242..24d786e07b49 100644
--- a/include/asm-x86/setup.h
+++ b/include/asm-x86/setup.h
@@ -14,19 +14,19 @@
14#define MAXMEM_PFN PFN_DOWN(MAXMEM) 14#define MAXMEM_PFN PFN_DOWN(MAXMEM)
15#define MAX_NONPAE_PFN (1 << 20) 15#define MAX_NONPAE_PFN (1 << 20)
16 16
17#define PARAM_SIZE 4096 17#endif /* __i386__ */
18
19#define PARAM_SIZE 4096 /* sizeof(struct boot_params) */
18 20
19#define OLD_CL_MAGIC_ADDR 0x90020
20#define OLD_CL_MAGIC 0xA33F 21#define OLD_CL_MAGIC 0xA33F
21#define OLD_CL_BASE_ADDR 0x90000 22#define OLD_CL_ADDRESS 0x020 /* Relative to real mode data */
22#define OLD_CL_OFFSET 0x90022
23#define NEW_CL_POINTER 0x228 /* Relative to real mode data */ 23#define NEW_CL_POINTER 0x228 /* Relative to real mode data */
24 24
25#endif /* __i386__ */
26
27#ifndef __ASSEMBLY__ 25#ifndef __ASSEMBLY__
28#include <asm/bootparam.h> 26#include <asm/bootparam.h>
29 27
28#ifndef _SETUP
29
30/* 30/*
31 * This is set up by the setup-routine at boot-time 31 * This is set up by the setup-routine at boot-time
32 */ 32 */
@@ -56,6 +56,7 @@ extern unsigned long init_pg_tables_end;
56#endif 56#endif
57 57
58#endif /* __i386__ */ 58#endif /* __i386__ */
59#endif /* _SETUP */
59#endif /* __ASSEMBLY__ */ 60#endif /* __ASSEMBLY__ */
60#endif /* __KERNEL__ */ 61#endif /* __KERNEL__ */
61 62