ia64/xen-unstable

changeset 8922:832649128a0c

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@novell.com>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Mon Feb 20 11:20:42 2006 +0000 (2006-02-20)
parents 5b4ff470dcc6
children 93e870416c93
files linux-2.6-xen-sparse/arch/i386/kernel/apic-xen.c linux-2.6-xen-sparse/arch/x86_64/kernel/apic-xen.c linux-2.6-xen-sparse/include/asm-i386/apic.h linux-2.6-xen-sparse/include/asm-x86_64/apic.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/apic-xen.c	Mon Feb 20 10:26:39 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/apic-xen.c	Mon Feb 20 11:20:42 2006 +0000
     1.3 @@ -85,13 +85,6 @@ int get_physical_broadcast(void)
     1.4          return 0xff;
     1.5  }
     1.6  
     1.7 -#ifdef CONFIG_XEN
     1.8 -void switch_APIC_timer_to_ipi(void *cpumask) { }
     1.9 -EXPORT_SYMBOL(switch_APIC_timer_to_ipi);
    1.10 -void switch_ipi_to_APIC_timer(void *cpumask) { }
    1.11 -EXPORT_SYMBOL(switch_ipi_to_APIC_timer);
    1.12 -#endif
    1.13 -
    1.14  #ifndef CONFIG_XEN
    1.15  #ifndef CONFIG_SMP
    1.16  static void up_apic_timer_interrupt_call(struct pt_regs *regs)
     2.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/apic-xen.c	Mon Feb 20 10:26:39 2006 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/apic-xen.c	Mon Feb 20 11:20:42 2006 +0000
     2.3 @@ -58,13 +58,6 @@ void ack_bad_irq(unsigned int irq)
     2.4  		ack_APIC_irq();
     2.5  }
     2.6  
     2.7 -#ifdef CONFIG_XEN
     2.8 -void switch_APIC_timer_to_ipi(void *cpumask) { }
     2.9 -EXPORT_SYMBOL(switch_APIC_timer_to_ipi);
    2.10 -void switch_ipi_to_APIC_timer(void *cpumask) { }
    2.11 -EXPORT_SYMBOL(switch_ipi_to_APIC_timer);
    2.12 -#endif
    2.13 -
    2.14  int setup_profiling_timer(unsigned int multiplier)
    2.15  {
    2.16  	return -EINVAL;
     3.1 --- a/linux-2.6-xen-sparse/include/asm-i386/apic.h	Mon Feb 20 10:26:39 2006 +0000
     3.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/apic.h	Mon Feb 20 11:20:42 2006 +0000
     3.3 @@ -132,10 +132,12 @@ extern unsigned int nmi_watchdog;
     3.4  
     3.5  extern int disable_timer_pin_1;
     3.6  
     3.7 +#ifndef CONFIG_XEN
     3.8  void smp_send_timer_broadcast_ipi(struct pt_regs *regs);
     3.9  void switch_APIC_timer_to_ipi(void *cpumask);
    3.10  void switch_ipi_to_APIC_timer(void *cpumask);
    3.11  #define ARCH_APICTIMER_STOPS_ON_C3	1
    3.12 +#endif
    3.13  
    3.14  #else /* !CONFIG_X86_LOCAL_APIC */
    3.15  static inline void lapic_shutdown(void) { }
     4.1 --- a/linux-2.6-xen-sparse/include/asm-x86_64/apic.h	Mon Feb 20 10:26:39 2006 +0000
     4.2 +++ b/linux-2.6-xen-sparse/include/asm-x86_64/apic.h	Mon Feb 20 11:20:42 2006 +0000
     4.3 @@ -105,11 +105,13 @@ extern int disable_timer_pin_1;
     4.4  
     4.5  extern void setup_threshold_lvt(unsigned long lvt_off);
     4.6  
     4.7 +#ifndef CONFIG_XEN
     4.8  void smp_send_timer_broadcast_ipi(void);
     4.9  void switch_APIC_timer_to_ipi(void *cpumask);
    4.10  void switch_ipi_to_APIC_timer(void *cpumask);
    4.11  
    4.12  #define ARCH_APICTIMER_STOPS_ON_C3	1
    4.13 +#endif
    4.14  
    4.15  #endif /* CONFIG_X86_LOCAL_APIC */
    4.16