diff options
author | H. Peter Anvin <hpa@zytor.com> | 2007-10-23 16:37:25 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-23 16:37:25 -0400 |
commit | fa76dab935b856871024530ec818bc0a8f88a016 (patch) | |
tree | 8d8a83d01d35a7b8d3559e75931e50c3f0f7723c /arch/x86/kernel/head_32.S | |
parent | 0de80bcc2baed116a569c38cbc38c5dcb945d14d (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 'arch/x86/kernel/head_32.S')
-rw-r--r-- | arch/x86/kernel/head_32.S | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index 00b1c2c56454..374b7ece8961 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
@@ -124,12 +124,7 @@ ENTRY(startup_32) | |||
124 | movsl | 124 | movsl |
125 | movl boot_params - __PAGE_OFFSET + NEW_CL_POINTER,%esi | 125 | movl boot_params - __PAGE_OFFSET + NEW_CL_POINTER,%esi |
126 | andl %esi,%esi | 126 | andl %esi,%esi |
127 | jnz 2f # New command line protocol | 127 | jz 1f # No comand line |
128 | cmpw $(OLD_CL_MAGIC),OLD_CL_MAGIC_ADDR | ||
129 | jne 1f | ||
130 | movzwl OLD_CL_OFFSET,%esi | ||
131 | addl $(OLD_CL_BASE_ADDR),%esi | ||
132 | 2: | ||
133 | movl $(boot_command_line - __PAGE_OFFSET),%edi | 128 | movl $(boot_command_line - __PAGE_OFFSET),%edi |
134 | movl $(COMMAND_LINE_SIZE/4),%ecx | 129 | movl $(COMMAND_LINE_SIZE/4),%ecx |
135 | rep | 130 | rep |