diff options
| author | Alexander Kuleshov <kuleshovmail@gmail.com> | 2015-02-19 13:34:58 +0600 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-19 10:05:04 +0100 |
| commit | fb148d83ec6924b7766731e58739d7281b6fb8c7 (patch) | |
| tree | dd051830459b83affde9dee23ef27eda38786426 /arch/x86/boot/compressed/head_32.S | |
| parent | 0cdb81bef20b1d9e12111fa6cd81f748ebd87778 (diff) | |
x86/asm/boot: Use already defined KEEP_SEGMENTS macro in head_{32,64}.S
There is already defined macro KEEP_SEGMENTS in
<asm/bootparam.h>, let's use it instead of hardcoded
constants.
Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1424331298-7456-1-git-send-email-kuleshovmail@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/boot/compressed/head_32.S')
| -rw-r--r-- | arch/x86/boot/compressed/head_32.S | 3 |
1 files changed, 2 insertions, 1 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 @@ #include <asm/page_types.h> #include <asm/boot.h> #include <asm/asm-offsets.h> +#include <asm/bootparam.h> __HEAD ENTRY(startup_32) @@ -102,7 +103,7 @@ preferred_addr: * Test KEEP_SEGMENTS flag to see if the bootloader is asking * us to not reload segments */ - testb $(1<<6), BP_loadflags(%esi) + testb $KEEP_SEGMENTS, BP_loadflags(%esi) jnz 1f cli |