x86/uv for v2.6.33
Linus,
Please pull the latest x86-uv-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-uv-for-linus
Thanks,
Ingo
------------------>
Dimitri Sivanich (5):
x86: UV RTC: Fix early expiry handling
x86: UV RTC: Add clocksource only boot option
x86: UV RTC: Clean up error handling
x86: UV RTC: Rename generic_interrupt to x86_platform_ipi
x86: UV RTC: Always enable RTC clocksource
arch/x86/include/asm/entry_arch.h | 2 +- arch/x86/include/asm/hardirq.h | 2 +- arch/x86/include/asm/hw_irq.h | 4 +- arch/x86/include/asm/irq.h | 2 +- arch/x86/include/asm/irq_vectors.h | 2 +- arch/x86/kernel/entry_64.S | 4 +- arch/x86/kernel/irq.c | 20 ++++---- arch/x86/kernel/irqinit.c | 4 +- arch/x86/kernel/uv_time.c | 80 ++++++++++++++++++++++-------------- 9 files changed, 69 insertions(+), 51 deletions(-)
arch/x86/include/asm/entry_arch.h +1 -1
@@ -34,7 +34,7 @@ BUILD_INTERRUPT3(invalidate_interrupt7,INVALIDATE_TLB_VECTOR_START+7, smp_invalidate_interrupt)#endif -BUILD_INTERRUPT (generic_interrupt,GENERIC_INTERRUPT_VECTOR ) +BUILD_INTERRUPT (x86_platform_ipi,X86_PLATFORM_IPI_VECTOR )/* * every pentium local APIC has two 'local interrupts', with a
arch/x86/include/asm/hardirq.h +1 -1
@@ -12,7 +12,7 @@ typedef struct {unsigned int apic_timer_irqs;/* arch dependent */ unsigned int irq_spurious_count;#endif -unsigned int generic_irqs;/* arch dependent */ +unsigned int x86_platform_ipis;/* arch dependent */ unsigned int apic_perf_irqs;unsigned int apic_pending_irqs;#ifdef CONFIG_SMP
arch/x86/include/asm/hw_irq.h +2 -2
@@ -27,7 +27,7 @@/* Interrupt handlers registered during init_IRQ */ extern void apic_timer_interrupt (void ); -extern void generic_interrupt (void ); +extern void x86_platform_ipi (void );extern void error_interrupt (void );extern void perf_pending_interrupt (void );
@@ -101,7 +101,7 @@ extern void eisa_set_level_irq(unsigned int irq);/* SMP */ extern void smp_apic_timer_interrupt (struct pt_regs *);extern void smp_spurious_interrupt (struct pt_regs *); -extern void smp_generic_interrupt (struct pt_regs *); +extern void smp_x86_platform_ipi (struct pt_regs *);extern void smp_error_interrupt (struct pt_regs *);#ifdef CONFIG_X86_IO_APIC extern asmlinkage void smp_irq_move_cleanup_interrupt(void);
arch/x86/include/asm/irq.h +1 -1
@@ -36,7 +36,7 @@ static inline int irq_canonicalize(int irq)extern void fixup_irqs (void );#endif -extern void (*generic_interrupt_extension)(void ); +extern void (*x86_platform_ipi_callback)(void );extern void native_init_IRQ (void );extern bool handle_irq (unsigned irq,struct pt_regs *regs);
arch/x86/include/asm/irq_vectors.h +1 -1
@@ -106,7 +106,7 @@/* * Generic system vector for platform specific use */ -#define GENERIC_INTERRUPT_VECTOR 0xed +#define X86_PLATFORM_IPI_VECTOR 0xed/* * Performance monitoring pending work vector:
arch/x86/kernel/entry_64.S +2 -2
@@ -969,8 +969,8 @@ apicinterrupt UV_BAU_MESSAGE \ #endif apicinterrupt LOCAL_TIMER_VECTOR \ apic_timer_interrupt smp_apic_timer_interrupt -apicinterrupt GENERIC_INTERRUPT_VECTOR \ - generic_interrupt smp_generic_interrupt +apicinterrupt X86_PLATFORM_IPI_VECTOR \ + x86_platform_ipi smp_x86_platform_ipi #ifdef CONFIG_SMP apicinterrupt INVALIDATE_TLB_VECTOR_START+0 \
arch/x86/kernel/irq.c +10 -10
@@ -18,7 +18,7 @@atomic_t irq_err_count;/* Function pointer for generic interrupt vector handling */ -void (*generic_interrupt_extension)(void ) =NULL ; +void (*x86_platform_ipi_callback)(void ) =NULL ;/* * 'what should we do if we get a hw irq event on an illegal vector'.
@@ -72,10 +72,10 @@ static int show_other_interrupts(struct seq_file *p, int prec)seq_printf (p,"%10u " ,irq_stats (j)->apic_pending_irqs);seq_printf (p," Performance pending work\n" );#endif -if (generic_interrupt_extension) { +if (x86_platform_ipi_callback) {seq_printf (p,"%*s: " , prec,"PLT" );for_each_online_cpu (j) -seq_printf (p,"%10u " ,irq_stats (j)->generic_irqs); +seq_printf (p,"%10u " ,irq_stats (j)->x86_platform_ipis);seq_printf (p," Platform interrupts\n" ); }#ifdef CONFIG_SMP
@@ -187,8 +187,8 @@ u64 arch_irq_stat_cpu(unsigned int cpu) sum +=irq_stats (cpu)->apic_perf_irqs; sum +=irq_stats (cpu)->apic_pending_irqs;#endif -if (generic_interrupt_extension) - sum +=irq_stats (cpu)->generic_irqs; +if (x86_platform_ipi_callback) + sum +=irq_stats (cpu)->x86_platform_ipis;#ifdef CONFIG_SMP sum +=irq_stats (cpu)->irq_resched_count; sum +=irq_stats (cpu)->irq_call_count;
@@ -252,9 +252,9 @@ unsigned int __irq_entry do_IRQ(struct pt_regs *regs) }/* -* Handler for GENERIC_INTERRUPT_VECTOR. +* Handler for X86_PLATFORM_IPI_VECTOR. */ -void smp_generic_interrupt (struct pt_regs *regs) +void smp_x86_platform_ipi (struct pt_regs *regs) {struct pt_regs *old_regs =set_irq_regs (regs);
@@ -264,10 +264,10 @@ void smp_generic_interrupt(struct pt_regs *regs)irq_enter (); -inc_irq_stat (generic_irqs); +inc_irq_stat (x86_platform_ipis); -if (generic_interrupt_extension) -generic_interrupt_extension (); +if (x86_platform_ipi_callback) +x86_platform_ipi_callback ();run_local_timers ();irq_exit ();
arch/x86/kernel/irqinit.c +2 -2
@@ -200,8 +200,8 @@ static void __init apic_intr_init(void)/* self generated IPI for local APIC timer */ alloc_intr_gate (LOCAL_TIMER_VECTOR , apic_timer_interrupt); -/* generic IPI for platform specific use */ -alloc_intr_gate (GENERIC_INTERRUPT_VECTOR , generic_interrupt); +/* IPI for X86 platform specific use */ +alloc_intr_gate (X86_PLATFORM_IPI_VECTOR , x86_platform_ipi);/* IPI vectors for APIC spurious and error interrupts */ alloc_intr_gate (SPURIOUS_APIC_VECTOR , spurious_interrupt);
arch/x86/kernel/uv_time.c +49 -31
181 lines not on this page · raw message