diff options
| -rw-r--r-- | i386/Makefrag.am | 4 | ||||
| -rw-r--r-- | i386/i386/percpu.c | 2 | ||||
| -rw-r--r-- | i386/i386at/model_dep.c | 2 | ||||
| -rw-r--r-- | x86_64/Makefrag.am | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/i386/Makefrag.am b/i386/Makefrag.am index c1724cea..58ee3273 100644 --- a/i386/Makefrag.am +++ b/i386/Makefrag.am @@ -96,6 +96,8 @@ libkernel_a_SOURCES += \ i386/i386/debug_trace.S \ i386/i386/idt_inittab.S \ i386/i386/locore.S \ + i386/i386/percpu.c \ + i386/i386/percpu.h \ i386/i386/spl.S \ i386/i386/cpuboot.S @@ -108,8 +110,6 @@ libkernel_a_SOURCES += \ i386/i386/irq.c \ i386/i386/irq.h \ i386/i386/msr.h \ - i386/i386/percpu.c \ - i386/i386/percpu.h \ i386/i386/pit.c \ i386/i386/pit.h diff --git a/i386/i386/percpu.c b/i386/i386/percpu.c index a4db7b68..c6b728b6 100644 --- a/i386/i386/percpu.c +++ b/i386/i386/percpu.c @@ -21,6 +21,7 @@ struct percpu percpu_array[NCPUS] = {0}; +#ifndef MACH_XEN void init_percpu(int cpu) { int apic_id = apic_get_current_cpu(); @@ -29,3 +30,4 @@ void init_percpu(int cpu) percpu_array[cpu].apic_id = apic_id; percpu_array[cpu].cpu_id = cpu; } +#endif diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c index d4bfe6f5..b0a55754 100644 --- a/i386/i386at/model_dep.c +++ b/i386/i386at/model_dep.c @@ -452,7 +452,9 @@ i386at_init(void) ldt_init(); ktss_init(); +#ifndef MACH_XEN init_percpu(0); +#endif #if NCPUS > 1 /* Initialize SMP structures in the master processor */ mp_desc_init(0); diff --git a/x86_64/Makefrag.am b/x86_64/Makefrag.am index 0c67517c..b0bc45c2 100644 --- a/x86_64/Makefrag.am +++ b/x86_64/Makefrag.am @@ -87,6 +87,8 @@ endif # libkernel_a_SOURCES += \ + i386/i386/percpu.h \ + i386/i386/percpu.c \ x86_64/cswitch.S \ x86_64/copy_user.c \ x86_64/debug_trace.S \ @@ -103,8 +105,6 @@ libkernel_a_SOURCES += \ i386/i386/irq.c \ i386/i386/irq.h \ i386/i386/msr.h \ - i386/i386/percpu.h \ - i386/i386/percpu.c \ i386/i386/pit.c \ i386/i386/pit.h |