aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/apic_64.c5
-rw-r--r--include/asm-x86/apic_64.h1
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 925758dbca0c..48206bb8de1f 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -39,7 +39,6 @@
39#include <asm/hpet.h> 39#include <asm/hpet.h>
40#include <asm/apic.h> 40#include <asm/apic.h>
41 41
42int apic_mapped;
43int apic_verbosity; 42int apic_verbosity;
44int apic_runs_main_timer; 43int apic_runs_main_timer;
45int apic_calibrate_pmtmr __initdata; 44int apic_calibrate_pmtmr __initdata;
@@ -706,8 +705,8 @@ void __init init_apic_mappings(void)
706 apic_phys = mp_lapic_addr; 705 apic_phys = mp_lapic_addr;
707 706
708 set_fixmap_nocache(FIX_APIC_BASE, apic_phys); 707 set_fixmap_nocache(FIX_APIC_BASE, apic_phys);
709 apic_mapped = 1; 708 apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n",
710 apic_printk(APIC_VERBOSE,"mapped APIC to %16lx (%16lx)\n", APIC_BASE, apic_phys); 709 APIC_BASE, apic_phys);
711 710
712 /* Put local APIC into the resource map. */ 711 /* Put local APIC into the resource map. */
713 lapic_resource.start = apic_phys; 712 lapic_resource.start = apic_phys;
diff --git a/include/asm-x86/apic_64.h b/include/asm-x86/apic_64.h
index 85125ef3c414..81335e95365b 100644
--- a/include/asm-x86/apic_64.h
+++ b/include/asm-x86/apic_64.h
@@ -19,7 +19,6 @@
19extern int apic_verbosity; 19extern int apic_verbosity;
20extern int apic_runs_main_timer; 20extern int apic_runs_main_timer;
21extern int ioapic_force; 21extern int ioapic_force;
22extern int apic_mapped;
23 22
24/* 23/*
25 * Define the default level of output to be very little 24 * Define the default level of output to be very little