diff options
-rw-r--r-- | arch/x86/boot/compressed/head_32.S | 3 | ||||
-rw-r--r-- | arch/x86/boot/compressed/head_64.S | 3 | ||||
-rw-r--r-- | arch/x86/kernel/head_32.S | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S index 1d7fbbcc196d..8ef964ddc18e 100644 --- a/arch/x86/boot/compressed/head_32.S +++ b/arch/x86/boot/compressed/head_32.S | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <asm/page_types.h> | 29 | #include <asm/page_types.h> |
30 | #include <asm/boot.h> | 30 | #include <asm/boot.h> |
31 | #include <asm/asm-offsets.h> | 31 | #include <asm/asm-offsets.h> |
32 | #include <asm/bootparam.h> | ||
32 | 33 | ||
33 | __HEAD | 34 | __HEAD |
34 | ENTRY(startup_32) | 35 | ENTRY(startup_32) |
@@ -102,7 +103,7 @@ preferred_addr: | |||
102 | * Test KEEP_SEGMENTS flag to see if the bootloader is asking | 103 | * Test KEEP_SEGMENTS flag to see if the bootloader is asking |
103 | * us to not reload segments | 104 | * us to not reload segments |
104 | */ | 105 | */ |
105 | testb $(1<<6), BP_loadflags(%esi) | 106 | testb $KEEP_SEGMENTS, BP_loadflags(%esi) |
106 | jnz 1f | 107 | jnz 1f |
107 | 108 | ||
108 | cli | 109 | cli |
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S index 6b1766c6c082..90c152135e92 100644 --- a/arch/x86/boot/compressed/head_64.S +++ b/arch/x86/boot/compressed/head_64.S | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <asm/msr.h> | 31 | #include <asm/msr.h> |
32 | #include <asm/processor-flags.h> | 32 | #include <asm/processor-flags.h> |
33 | #include <asm/asm-offsets.h> | 33 | #include <asm/asm-offsets.h> |
34 | #include <asm/bootparam.h> | ||
34 | 35 | ||
35 | __HEAD | 36 | __HEAD |
36 | .code32 | 37 | .code32 |
@@ -46,7 +47,7 @@ ENTRY(startup_32) | |||
46 | * Test KEEP_SEGMENTS flag to see if the bootloader is asking | 47 | * Test KEEP_SEGMENTS flag to see if the bootloader is asking |
47 | * us to not reload segments | 48 | * us to not reload segments |
48 | */ | 49 | */ |
49 | testb $(1<<6), BP_loadflags(%esi) | 50 | testb $KEEP_SEGMENTS, BP_loadflags(%esi) |
50 | jnz 1f | 51 | jnz 1f |
51 | 52 | ||
52 | cli | 53 | cli |
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index f36bd42d6f0c..d031bad9e07e 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <asm/cpufeature.h> | 22 | #include <asm/cpufeature.h> |
23 | #include <asm/percpu.h> | 23 | #include <asm/percpu.h> |
24 | #include <asm/nops.h> | 24 | #include <asm/nops.h> |
25 | #include <asm/bootparam.h> | ||
25 | 26 | ||
26 | /* Physical address */ | 27 | /* Physical address */ |
27 | #define pa(X) ((X) - __PAGE_OFFSET) | 28 | #define pa(X) ((X) - __PAGE_OFFSET) |
@@ -90,7 +91,7 @@ ENTRY(startup_32) | |||
90 | 91 | ||
91 | /* test KEEP_SEGMENTS flag to see if the bootloader is asking | 92 | /* test KEEP_SEGMENTS flag to see if the bootloader is asking |
92 | us to not reload segments */ | 93 | us to not reload segments */ |
93 | testb $(1<<6), BP_loadflags(%esi) | 94 | testb $KEEP_SEGMENTS, BP_loadflags(%esi) |
94 | jnz 2f | 95 | jnz 2f |
95 | 96 | ||
96 | /* | 97 | /* |