[Xen-changelog] Don't define ARCH_APICTIMER_STOPS_ON_C3.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID 832649128a0cb8e216763a8cd0cd7af2a8462464
# Parent  5b4ff470dcc66f1655d8d22a66a298704172d907
Don't define ARCH_APICTIMER_STOPS_ON_C3.
Protect the calls to the switch_APIC_timer_to_ipi and
switch_ipi_to_APIC_timer functions since we don't implement
smp_send_timer_broadcast_ipi().

From: Jan Beulich <JBeulich@xxxxxxxxxx>
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>

diff -r 5b4ff470dcc6 -r 832649128a0c 
linux-2.6-xen-sparse/arch/i386/kernel/apic-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/apic-xen.c  Mon Feb 20 10:26:39 2006
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/apic-xen.c  Mon Feb 20 11:20:42 2006
@@ -85,13 +85,6 @@
         return 0xff;
 }
 
-#ifdef CONFIG_XEN
-void switch_APIC_timer_to_ipi(void *cpumask) { }
-EXPORT_SYMBOL(switch_APIC_timer_to_ipi);
-void switch_ipi_to_APIC_timer(void *cpumask) { }
-EXPORT_SYMBOL(switch_ipi_to_APIC_timer);
-#endif
-
 #ifndef CONFIG_XEN
 #ifndef CONFIG_SMP
 static void up_apic_timer_interrupt_call(struct pt_regs *regs)
diff -r 5b4ff470dcc6 -r 832649128a0c 
linux-2.6-xen-sparse/arch/x86_64/kernel/apic-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/apic-xen.c        Mon Feb 20 
10:26:39 2006
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/apic-xen.c        Mon Feb 20 
11:20:42 2006
@@ -57,13 +57,6 @@
        if (!disable_apic)
                ack_APIC_irq();
 }
-
-#ifdef CONFIG_XEN
-void switch_APIC_timer_to_ipi(void *cpumask) { }
-EXPORT_SYMBOL(switch_APIC_timer_to_ipi);
-void switch_ipi_to_APIC_timer(void *cpumask) { }
-EXPORT_SYMBOL(switch_ipi_to_APIC_timer);
-#endif
 
 int setup_profiling_timer(unsigned int multiplier)
 {
diff -r 5b4ff470dcc6 -r 832649128a0c 
linux-2.6-xen-sparse/include/asm-i386/apic.h
--- a/linux-2.6-xen-sparse/include/asm-i386/apic.h      Mon Feb 20 10:26:39 2006
+++ b/linux-2.6-xen-sparse/include/asm-i386/apic.h      Mon Feb 20 11:20:42 2006
@@ -132,10 +132,12 @@
 
 extern int disable_timer_pin_1;
 
+#ifndef CONFIG_XEN
 void smp_send_timer_broadcast_ipi(struct pt_regs *regs);
 void switch_APIC_timer_to_ipi(void *cpumask);
 void switch_ipi_to_APIC_timer(void *cpumask);
 #define ARCH_APICTIMER_STOPS_ON_C3     1
+#endif
 
 #else /* !CONFIG_X86_LOCAL_APIC */
 static inline void lapic_shutdown(void) { }
diff -r 5b4ff470dcc6 -r 832649128a0c 
linux-2.6-xen-sparse/include/asm-x86_64/apic.h
--- a/linux-2.6-xen-sparse/include/asm-x86_64/apic.h    Mon Feb 20 10:26:39 2006
+++ b/linux-2.6-xen-sparse/include/asm-x86_64/apic.h    Mon Feb 20 11:20:42 2006
@@ -105,11 +105,13 @@
 
 extern void setup_threshold_lvt(unsigned long lvt_off);
 
+#ifndef CONFIG_XEN
 void smp_send_timer_broadcast_ipi(void);
 void switch_APIC_timer_to_ipi(void *cpumask);
 void switch_ipi_to_APIC_timer(void *cpumask);
 
 #define ARCH_APICTIMER_STOPS_ON_C3     1
+#endif
 
 #endif /* CONFIG_X86_LOCAL_APIC */
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog