From: tip-bot for Borislav Petkov <bp@suse.de>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
tglx@linutronix.de, hpa@linux.intel.com, bp@suse.de
Subject: [tip:x86/asm] x86, head_32: Give the 6 label a real name
Date: Tue, 12 Feb 2013 16:11:23 -0800 [thread overview]
Message-ID: <tip-5e2a044daf0c6f897eb69de931e3b29020e874a9@git.kernel.org> (raw)
In-Reply-To: <1360592538-10643-5-git-send-email-bp@alien8.de>
Commit-ID: 5e2a044daf0c6f897eb69de931e3b29020e874a9
Gitweb: http://git.kernel.org/tip/5e2a044daf0c6f897eb69de931e3b29020e874a9
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Mon, 11 Feb 2013 15:22:18 +0100
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Tue, 12 Feb 2013 15:48:42 -0800
x86, head_32: Give the 6 label a real name
Jumping here we are about to enable paging so rename the label
accordingly.
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1360592538-10643-5-git-send-email-bp@alien8.de
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
arch/x86/kernel/head_32.S | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 2e8532e..3c3f58a 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -329,7 +329,7 @@ default_entry:
pushfl
popl %eax # get EFLAGS
testl $X86_EFLAGS_ID,%eax # did EFLAGS.ID remained set?
- jz 6f # hw disallowed setting of ID bit
+ jz enable_paging # hw disallowed setting of ID bit
# which means no CPUID and no CR4
xorl %eax,%eax
@@ -339,13 +339,13 @@ default_entry:
movl $1,%eax
cpuid
andl $~1,%edx # Ignore CPUID.FPU
- jz 6f # No flags or only CPUID.FPU = no CR4
+ jz enable_paging # No flags or only CPUID.FPU = no CR4
movl pa(mmu_cr4_features),%eax
movl %eax,%cr4
testb $X86_CR4_PAE, %al # check if PAE is enabled
- jz 6f
+ jz enable_paging
/* Check if extended functions are implemented */
movl $0x80000000, %eax
@@ -353,7 +353,7 @@ default_entry:
/* Value must be in the range 0x80000001 to 0x8000ffff */
subl $0x80000001, %eax
cmpl $(0x8000ffff-0x80000001), %eax
- ja 6f
+ ja enable_paging
/* Clear bogus XD_DISABLE bits */
call verify_cpu
@@ -362,7 +362,7 @@ default_entry:
cpuid
/* Execute Disable bit supported? */
btl $(X86_FEATURE_NX & 31), %edx
- jnc 6f
+ jnc enable_paging
/* Setup EFER (Extended Feature Enable Register) */
movl $MSR_EFER, %ecx
@@ -372,7 +372,7 @@ default_entry:
/* Make changes effective */
wrmsr
-6:
+enable_paging:
/*
* Enable paging
next prev parent reply other threads:[~2013-02-13 0:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-11 14:22 [PATCH 0/4 -v3] x86, head_32: Some cleanups Borislav Petkov
2013-02-11 14:22 ` [PATCH 1/4] x86, head_32: Remove i386 pieces Borislav Petkov
2013-02-13 0:07 ` [tip:x86/asm] " tip-bot for Borislav Petkov
2013-02-11 14:22 ` [PATCH 2/4] x86: Detect CPUID support early at boot Borislav Petkov
2013-02-13 0:09 ` [tip:x86/asm] " tip-bot for Borislav Petkov
2013-02-11 14:22 ` [PATCH 3/4] x86, head_32: Remove second CPUID detection from default_entry Borislav Petkov
2013-02-11 15:49 ` H. Peter Anvin
2013-02-11 17:15 ` Borislav Petkov
2013-02-11 17:21 ` H. Peter Anvin
2013-02-13 0:10 ` [tip:x86/asm] " tip-bot for Borislav Petkov
2013-02-11 14:22 ` [PATCH 4/4] x86, head_32: Give the 6 label a real name Borislav Petkov
2013-02-13 0:11 ` tip-bot for Borislav Petkov [this message]
2013-02-11 16:56 ` [PATCH 0/4 -v3] x86, head_32: Some cleanups H. Peter Anvin
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=tip-5e2a044daf0c6f897eb69de931e3b29020e874a9@git.kernel.org \
--to=bp@suse.de \
--cc=hpa@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).