All of lore.kernel.org
 help / color / mirror / Atom feed
From: Borislav Petkov <bp@alien8.de>
To: "H. Peter Anvin" <hpa@zytor.com>
Cc: X86 ML <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
	Borislav Petkov <bp@suse.de>
Subject: [PATCH 4/5] x86, head_32: Give the 6 label a real name
Date: Sat,  9 Feb 2013 20:52:53 +0100	[thread overview]
Message-ID: <1360439574-16122-5-git-send-email-bp@alien8.de> (raw)
In-Reply-To: <1360439574-16122-1-git-send-email-bp@alien8.de>

From: Borislav Petkov <bp@suse.de>

Jumping here we are about to enable paging so rename the label
accordingly.

Signed-off-by: Borislav Petkov <bp@suse.de>
---
 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 46aa51467c0e..75e96d7e4e5f 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -339,7 +339,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
@@ -349,13 +349,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
@@ -363,7 +363,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
@@ -372,7 +372,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
@@ -382,7 +382,7 @@ default_entry:
 	/* Make changes effective */
 	wrmsr
 
-6:
+enable_paging:
 
 /*
  * Enable paging
-- 
1.8.1.3.535.ga923c31


  parent reply	other threads:[~2013-02-09 19:53 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-09 19:52 [PATCH 0/5] x86, head_32: Some cleanups, -v2 Borislav Petkov
2013-02-09 19:52 ` [PATCH 1/5] x86, head_32: Remove i386 pieces Borislav Petkov
2013-02-09 19:52 ` [PATCH 2/5] x86: Detect CPUID support early at boot Borislav Petkov
2013-02-09 19:52 ` [PATCH 3/5] x86, head_32: Remove second CPUID detection from default_entry Borislav Petkov
2013-02-09 19:52 ` Borislav Petkov [this message]
2013-02-09 19:52 ` [PATCH 5/5] x86, head_32: Remove an old gcc2 fix Borislav Petkov
2013-02-09 20:51   ` H. Peter Anvin
2013-02-09 20:52   ` H. Peter Anvin
2013-02-09 21:23     ` Borislav Petkov
2013-02-09 22:08       ` [PATCH 5/5 -v2] x86, head_32: Clear DF much earlier Borislav Petkov
2013-02-09 22:23       ` [PATCH 5/5] x86, head_32: Remove an old gcc2 fix H. Peter Anvin
2013-02-09 23:13         ` Borislav Petkov
2013-02-09 23:16           ` [PATCH 2/5 -v2.1] x86: Detect CPUID support early at boot Borislav Petkov
2013-02-10  4:34             ` H. Peter Anvin
2013-02-10  8:36               ` Borislav Petkov
2013-02-10 15:10                 ` 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=1360439574-16122-5-git-send-email-bp@alien8.de \
    --to=bp@alien8.de \
    --cc=bp@suse.de \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=x86@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.