From 71ff503c849cb5600de5d47d8887db3d4aa252bc Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 30 Jan 2008 13:33:27 +0100 Subject: [PATCH] --- yaml --- r: 80374 b: refs/heads/master c: 5756dd59f118daacd68ee971a2381360ef769c48 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/head_32.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 97b44ba3a3d8..03027c2be3d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 503595010f2024b236fd2636a7318fe64c794d6c +refs/heads/master: 5756dd59f118daacd68ee971a2381360ef769c48 diff --git a/trunk/arch/x86/kernel/head_32.S b/trunk/arch/x86/kernel/head_32.S index 7b9b2566b7a8..a2b6331434da 100644 --- a/trunk/arch/x86/kernel/head_32.S +++ b/trunk/arch/x86/kernel/head_32.S @@ -221,6 +221,8 @@ ENTRY(startup_32_smp) movl %eax,%es movl %eax,%fs movl %eax,%gs +#endif /* CONFIG_SMP */ +3: /* * New page tables may be in 4Mbyte page mode and may @@ -267,8 +269,6 @@ ENTRY(startup_32_smp) wrmsr 6: -#endif /* CONFIG_SMP */ -3: /* * Enable paging