From: Alexander Kuleshov <kuleshovmail@gmail.com>
To: Chris Mason <clm@fb.com>
Cc: Josef Bacik <jbacik@fb.com>, David Sterba <dsterba@suse.cz>,
linux-kernel@vger.kernel.org,
Alexander Kuleshov <kuleshovmail@gmail.com>
Subject: [PATCH v2 1/2] x86: use already defined KEEP_SEGMENTS macro from bootparam.h
Date: Sat, 31 Jan 2015 12:30:04 +0600 [thread overview]
Message-ID: <1422685804-5863-1-git-send-email-kuleshovmail@gmail.com> (raw)
In-Reply-To: <1422685775-5804-1-git-send-email-kuleshovmail@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 <kuleshovmail@gmail.com>
---
arch/x86/kernel/head_32.S | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index f36bd42..fba3990 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -22,7 +22,8 @@
#include <asm/cpufeature.h>
#include <asm/percpu.h>
#include <asm/nops.h>
-
+#include <asm/bootmparam.h>
+
/* Physical address */
#define pa(X) ((X) - __PAGE_OFFSET)
@@ -89,8 +90,8 @@ ENTRY(startup_32)
movl pa(stack_start),%ecx
/* test KEEP_SEGMENTS flag to see if the bootloader is asking
- us to not reload segments */
- testb $(1<<6), BP_loadflags(%esi)
+ us to not reload segments */
+ testb $KEEP_SEGMENTS, BP_loadflags(%esi)
jnz 2f
/*
--
2.3.0-rc1
next prev parent reply other threads:[~2015-01-31 6:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-31 6:29 [PATCH v2 0/2] x86: loadflags cleanups Alexander Kuleshov
2015-01-31 6:30 ` Alexander Kuleshov [this message]
2015-01-31 6:30 ` [PATCH v2 2/2] x86/boot: use already defined KEEP_SEGMENTS macro in head_{32,64}.S Alexander Kuleshov
2015-01-31 6:31 ` Alexander Kuleshov
2015-01-31 6:32 [PATCH v2 0/2] x86: loadflags cleanups Alexander Kuleshov
2015-01-31 6:32 ` [PATCH v2 1/2] x86: use already defined KEEP_SEGMENTS macro from bootparam.h Alexander Kuleshov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1422685804-5863-1-git-send-email-kuleshovmail@gmail.com \
--to=kuleshovmail@gmail.com \
--cc=clm@fb.com \
--cc=dsterba@suse.cz \
--cc=jbacik@fb.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome