diff options
author | Glauber Costa <gcosta@redhat.com> | 2008-05-28 11:57:02 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 06:48:17 -0400 |
commit | e3f77edfc1d0beb7b10f9f31d9e39206f7dbef7b (patch) | |
tree | 54f6b89dd5aefa2e205a19b04199d6f5fcaaa840 /arch/x86 | |
parent | a939098afcfa5f81d3474782ec15c6d114e57763 (diff) |
x86: use initial_code for i386
x86_64 jumps to whatever is written in "initial_code" symbol,
instead of a fixed address. Do it for i386 too. It will allow us
to integrate more of the smp boot code.
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/head_32.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index b98b338aae1a..ffb73a5b609f 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
@@ -455,7 +455,10 @@ is386: movl $2,%ecx # set MP | |||
455 | jmp initialize_secondary # all other CPUs call initialize_secondary | 455 | jmp initialize_secondary # all other CPUs call initialize_secondary |
456 | 1: | 456 | 1: |
457 | #endif /* CONFIG_SMP */ | 457 | #endif /* CONFIG_SMP */ |
458 | jmp i386_start_kernel | 458 | jmp *(initial_code) |
459 | .align 4 | ||
460 | ENTRY(initial_code) | ||
461 | .long i386_start_kernel | ||
459 | 462 | ||
460 | /* | 463 | /* |
461 | * We depend on ET to be correct. This checks for 287/387. | 464 | * We depend on ET to be correct. This checks for 287/387. |