Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4646575d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: UV RTC: Always enable RTC clocksource
  x86: UV RTC: Rename generic_interrupt to x86_platform_ipi
  x86: UV RTC: Clean up error handling
  x86: UV RTC: Add clocksource only boot option
  x86: UV RTC: Fix early expiry handling
parents 86ed4aa4 581f202b

arch/x86/include/asm/entry_arch.h

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);
@@ -119,7 +119,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
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ extern void fixup_irqs(void); 
extern void irq_force_complete_move(int);

#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
Original line number Diff line number Diff line
@@ -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: