Skip to content

Commit

Permalink
x86, head_32: Give the 6 label a real name
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Borislav Petkov authored and H. Peter Anvin committed Feb 12, 2013
1 parent c3a22a2 commit 5e2a044
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions arch/x86/kernel/head_32.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -339,21 +339,21 @@ 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
cpuid
/* 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
Expand All @@ -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
Expand All @@ -372,7 +372,7 @@ default_entry:
/* Make changes effective */
wrmsr

6:
enable_paging:

/*
* Enable paging
Expand Down

0 comments on commit 5e2a044

Please sign in to comment.