aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/boot/setup.S
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86_64/boot/setup.S')
-rw-r--r--arch/x86_64/boot/setup.S7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86_64/boot/setup.S b/arch/x86_64/boot/setup.S
index 816d04faa2be..4f8851000d7e 100644
--- a/arch/x86_64/boot/setup.S
+++ b/arch/x86_64/boot/setup.S
@@ -51,6 +51,7 @@
51#include <asm/boot.h> 51#include <asm/boot.h>
52#include <asm/e820.h> 52#include <asm/e820.h>
53#include <asm/page.h> 53#include <asm/page.h>
54#include <asm/setup.h>
54 55
55/* Signature words to ensure LILO loaded us right */ 56/* Signature words to ensure LILO loaded us right */
56#define SIG1 0xAA55 57#define SIG1 0xAA55
@@ -80,7 +81,7 @@ start:
80# This is the setup header, and it must start at %cs:2 (old 0x9020:2) 81# This is the setup header, and it must start at %cs:2 (old 0x9020:2)
81 82
82 .ascii "HdrS" # header signature 83 .ascii "HdrS" # header signature
83 .word 0x0205 # header version number (>= 0x0105) 84 .word 0x0206 # header version number (>= 0x0105)
84 # or else old loadlin-1.5 will fail) 85 # or else old loadlin-1.5 will fail)
85realmode_swtch: .word 0, 0 # default_switch, SETUPSEG 86realmode_swtch: .word 0, 0 # default_switch, SETUPSEG
86start_sys_seg: .word SYSSEG 87start_sys_seg: .word SYSSEG
@@ -165,6 +166,10 @@ relocatable_kernel: .byte 0
165pad2: .byte 0 166pad2: .byte 0
166pad3: .word 0 167pad3: .word 0
167 168
169cmdline_size: .long COMMAND_LINE_SIZE-1 #length of the command line,
170 #added with boot protocol
171 #version 2.06
172
168trampoline: call start_of_setup 173trampoline: call start_of_setup
169 .align 16 174 .align 16
170 # The offset at this point is 0x240 175 # The offset at this point is 0x240