Messages in this thread Patch in this message | | | Date | Fri, 28 Jun 2013 22:45:16 +0800 | From | Wang YanQing <> | Subject | [PATCH v2]x86: Fix override new_cpu_data.x86 with 486 |
| |
We should set X86 to 486 before use cpuid to detect the cpu type, if we set X86 to 486 after cpuid, then we will get 486 until cpu_detect runs.
Signed-off-by: Wang YanQing <udknight@gmail.com> --- ChangeLog v1-v2: 1:Use more accurate and short commit log
arch/x86/kernel/head_32.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index 73afd11..24c6675 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S @@ -410,6 +410,7 @@ enable_paging: /* * Check if it is 486 */ + movb $4,X86 # at least 486 cmpl $-1,X86_CPUID je is486 @@ -437,7 +438,6 @@ enable_paging: movl %edx,X86_CAPABILITY is486: - movb $4,X86 movl $0x50022,%ecx # set AM, WP, NE and MP movl %cr0,%eax andl $0x80000011,%eax # Save PG,PE,ET -- 1.7.12.4.dirty
| |