From eb3a739df0f3b661160bb145b60bea89ff64534e Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Wed, 28 May 2008 12:57:02 -0300 Subject: [PATCH] --- yaml --- r: 99849 b: refs/heads/master c: e3f77edfc1d0beb7b10f9f31d9e39206f7dbef7b h: refs/heads/master i: 99847: 2bfb55e92082af4aace44485cf32aad44c0f4392 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/head_32.S | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8eb121eb85a0..c7c4a16700a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a939098afcfa5f81d3474782ec15c6d114e57763 +refs/heads/master: e3f77edfc1d0beb7b10f9f31d9e39206f7dbef7b diff --git a/trunk/arch/x86/kernel/head_32.S b/trunk/arch/x86/kernel/head_32.S index b98b338aae1a..ffb73a5b609f 100644 --- a/trunk/arch/x86/kernel/head_32.S +++ b/trunk/arch/x86/kernel/head_32.S @@ -455,7 +455,10 @@ is386: movl $2,%ecx # set MP jmp initialize_secondary # all other CPUs call initialize_secondary 1: #endif /* CONFIG_SMP */ - jmp i386_start_kernel + jmp *(initial_code) +.align 4 +ENTRY(initial_code) + .long i386_start_kernel /* * We depend on ET to be correct. This checks for 287/387.