Sorry for noise, misunderstood send-email alias with maintainers. 2015-01-31 12:30 GMT+06:00 Alexander Kuleshov <kuleshovm...@gmail.com>: > There is already defined macro KEEP_SEGMENTS in the > bootparam.h, let's use it instead of shifting bits > > Signed-off-by: Alexander Kuleshov <kuleshovm...@gmail.com> > --- > arch/x86/boot/compressed/head_32.S | 5 +++-- > arch/x86/boot/compressed/head_64.S | 3 ++- > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/boot/compressed/head_32.S > b/arch/x86/boot/compressed/head_32.S > index 1d7fbbc..11e549d 100644 > --- a/arch/x86/boot/compressed/head_32.S > +++ b/arch/x86/boot/compressed/head_32.S > @@ -29,7 +29,8 @@ > #include <asm/page_types.h> > #include <asm/boot.h> > #include <asm/asm-offsets.h> > - > +#include <asm/bootparam.h> > + > __HEAD > ENTRY(startup_32) > #ifdef CONFIG_EFI_STUB > @@ -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 > diff --git a/arch/x86/boot/compressed/head_64.S > b/arch/x86/boot/compressed/head_64.S > index 6b1766c..90c1521 100644 > --- a/arch/x86/boot/compressed/head_64.S > +++ b/arch/x86/boot/compressed/head_64.S > @@ -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 > -- > 2.3.0-rc1 >
-- _________________________ 0xAX -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
