From 32aee7665525c44ecd2e8d04ccb0d4ea26faa5e7 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 10 Jul 2012 21:48:23 +0200 Subject: [PATCH] remove obsolete symbols in a single environment --- arch/x86/kernel/entry64.asm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/kernel/entry64.asm b/arch/x86/kernel/entry64.asm index 04108c2d..f70d9f44 100644 --- a/arch/x86/kernel/entry64.asm +++ b/arch/x86/kernel/entry64.asm @@ -96,6 +96,7 @@ boot_pt times (NOPTS*512) DQ 0 SECTION .text ALIGN 8 +%if MAX_CORES > 1 global smp_entry smp_entry: ; enable caching, disable paging and fpu emulation @@ -136,6 +137,7 @@ smp_entry: jmp GDT64.Code:smp_start64 ; Set the code segment and enter 64-bit long mode. jmp $ ; endless loop +%endif search_apic: push ebp @@ -369,6 +371,7 @@ start64: call main jmp $ +%if MAX_CORES > 1 smp_start64: ; initialize segment registers mov ax, GDT64.Data @@ -382,6 +385,7 @@ smp_start64: extern smp_start call smp_start jmp $ +%endif global cpu_init cpu_init: