From 34ee98d23d72cb16685e0da8a76a94be307c4299 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Sat, 1 Dec 2007 18:34:06 -0700 Subject: [PATCH] --- yaml --- r: 74545 b: refs/heads/master c: 17d57a9206b4de6ad082ac9f2d2346985abbd2aa h: refs/heads/master i: 74543: 67fc97984a0b0fa094259ffae769137ca7e7a609 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/head_32.S | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 008c9890b124..51f22f04c8b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c1b2724069951b1902373e688042b2ec382f68f +refs/heads/master: 17d57a9206b4de6ad082ac9f2d2346985abbd2aa diff --git a/trunk/arch/x86/kernel/head_32.S b/trunk/arch/x86/kernel/head_32.S index 374b7ece8961..ac0637a6d71c 100644 --- a/trunk/arch/x86/kernel/head_32.S +++ b/trunk/arch/x86/kernel/head_32.S @@ -193,6 +193,12 @@ default_entry: jb 10b movl %edi,(init_pg_tables_end - __PAGE_OFFSET) + /* Do an early initialization of the fixmap area */ + movl $(swapper_pg_dir - __PAGE_OFFSET), %edx + movl $(swapper_pg_pmd - __PAGE_OFFSET), %eax + addl $0x007, %eax /* 0x007 = PRESENT+RW+USER */ + movl %eax, 4092(%edx) + xorl %ebx,%ebx /* This is the boot CPU (BSP) */ jmp 3f /* @@ -208,12 +214,6 @@ default_entry: .section .init.text,"ax",@progbits #endif - /* Do an early initialization of the fixmap area */ - movl $(swapper_pg_dir - __PAGE_OFFSET), %edx - movl $(swapper_pg_pmd - __PAGE_OFFSET), %eax - addl $0x007, %eax /* 0x007 = PRESENT+RW+USER */ - movl %eax, 4092(%edx) - #ifdef CONFIG_SMP ENTRY(startup_32_smp) cld