x86: use already defined KEEP_SEGMENT macro in head_{32,64}.S
PATCH v2 1/1 x86: use already defined KEEP_SEGMENT macro in head_{32,64}.S
There is already defined macro KEEP_SEGMENTS in the <asm/bootparam.h>, let's use it instead of shifting bits.
Signed-off-by Alexander Kuleshov <[email protected]>
--- arch/x86/boot/compressed/head_32.S | 3 ++- arch/x86/boot/compressed/head_64.S | 3 ++- arch/x86/kernel/head_32.S | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-)
arch/x86/boot/compressed/head_32.S +2 -1
@@ -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_SEGEMENTS, BP_loadflags(%esi) jnz 1f cli
arch/x86/boot/compressed/head_64.S +2 -1
@@ -31,6 +31,7 @@ #include <asm/msr.h> #include <asm/processor-flags.h> #include <asm/asm-offsets.h> +#include <asm/bootparam.h> __HEAD .code32
@@ -46,7 +47,7 @@ ENTRY(startup_32) * 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
arch/x86/kernel/head_32.S +2 -1
@@ -22,6 +22,7 @@ #include <asm/cpufeature.h> #include <asm/percpu.h> #include <asm/nops.h> +#include <asm/bootparam.h> /* Physical address */ #define pa(X) ((X) - __PAGE_OFFSET)
@@ -90,7 +91,7 @@ ENTRY(startup_32) /* 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 2f /*
Signature · 1 line
2.3.0.80.g18d0fec
PATCH v3 1/1 x86: use already defined KEEP_SEGMENTS macro in head_{32,64}.S
There is already defined macro KEEP_SEGMENTS in the <asm/bootparam.h>, let's use it instead of shifting bits.
Signed-off-by Alexander Kuleshov <[email protected]>
--- arch/x86/boot/compressed/head_32.S | 3 ++- arch/x86/boot/compressed/head_64.S | 3 ++- arch/x86/kernel/head_32.S | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-)
arch/x86/boot/compressed/head_32.S +2 -1
@@ -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
arch/x86/boot/compressed/head_64.S +2 -1
@@ -31,6 +31,7 @@ #include <asm/msr.h> #include <asm/processor-flags.h> #include <asm/asm-offsets.h> +#include <asm/bootparam.h> __HEAD .code32
@@ -46,7 +47,7 @@ ENTRY(startup_32) * 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
arch/x86/kernel/head_32.S +2 -1
@@ -22,6 +22,7 @@ #include <asm/cpufeature.h> #include <asm/percpu.h> #include <asm/nops.h> +#include <asm/bootparam.h> /* Physical address */ #define pa(X) ((X) - __PAGE_OFFSET)
@@ -90,7 +91,7 @@ ENTRY(startup_32) /* 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 2f /*
Signature · 1 line
2.3.0.80.g18d0fec
tip-bot for Alexander Kuleshov
merge bot[tip:x86/asm] x86/asm/boot: Use already defined KEEP_SEGMENTS macro in head_{32,64}.S
x86/asm/boot: Use already defined KEEP_SEGMENTS macro in head_{32,64}.S
Commit-ID: fb148d83ec6924b7766731e58739d7281b6fb8c7 Gitweb: http://git.kernel.org/tip/fb148d83ec6924b7766731e58739d7281b6fb8c7 Author: Alexander Kuleshov <[email protected]> AuthorDate: Thu, 19 Feb 2015 13:34:58 +0600 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 19 Feb 2015 10:05:04 +0100
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 <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Thomas Gleixner <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/boot/compressed/head_32.S | 3 ++- arch/x86/boot/compressed/head_64.S | 3 ++- arch/x86/kernel/head_32.S | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-)
arch/x86/boot/compressed/head_32.S +2 -1
@@ -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
arch/x86/boot/compressed/head_64.S +2 -1
@@ -31,6 +31,7 @@ #include <asm/msr.h> #include <asm/processor-flags.h> #include <asm/asm-offsets.h> +#include <asm/bootparam.h> __HEAD .code32
@@ -46,7 +47,7 @@ ENTRY(startup_32) * 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
arch/x86/kernel/head_32.S +2 -1
@@ -22,6 +22,7 @@ #include <asm/cpufeature.h> #include <asm/percpu.h> #include <asm/nops.h> +#include <asm/bootparam.h> /* Physical address */ #define pa(X) ((X) - __PAGE_OFFSET)
@@ -90,7 +91,7 @@ ENTRY(startup_32) /* 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 2f /*