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

Commit 31bbed52 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/uv' into x86/core

parents 0fbba487 b2b35259

arch/x86/include/asm/apic.h

+2 −0
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ static inline u32 safe_apic_wait_icr_idle(void) 


static inline void ack_APIC_irq(void)

{

#ifdef CONFIG_X86_LOCAL_APIC

	/*

	 * ack_APIC_irq() actually gets compiled as a single instruction

	 * ... yummie.
@@ -386,6 +387,7 @@ static inline void ack_APIC_irq(void) 


	/* Docs say use 0 for future compatibility */

	apic_write(APIC_EOI, 0);

#endif

}



static inline unsigned default_get_apic_id(unsigned long x)

arch/x86/include/asm/entry_arch.h

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ BUILD_INTERRUPT3(invalidate_interrupt7,INVALIDATE_TLB_VECTOR_START+7, 
		 smp_invalidate_interrupt)

#endif



BUILD_INTERRUPT(generic_interrupt, GENERIC_INTERRUPT_VECTOR)



/*

 * every pentium local APIC has two 'local interrupts', with a

 * soft-definable vector attached to both interrupts, one of

arch/x86/include/asm/hardirq.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ typedef struct { 
	unsigned int apic_timer_irqs;	/* arch dependent */

	unsigned int irq_spurious_count;

#endif

	unsigned int generic_irqs;	/* arch dependent */

#ifdef CONFIG_SMP

	unsigned int irq_resched_count;

	unsigned int irq_call_count;

arch/x86/include/asm/hw_irq.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


/* Interrupt handlers registered during init_IRQ */

extern void apic_timer_interrupt(void);

extern void generic_interrupt(void);

extern void error_interrupt(void);

extern void spurious_interrupt(void);

extern void thermal_interrupt(void);

arch/x86/include/asm/irq.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ static inline int irq_canonicalize(int irq) 
extern void fixup_irqs(void);

#endif



extern void (*generic_interrupt_extension)(void);

extern void init_IRQ(void);

extern void native_init_IRQ(void);

extern bool handle_irq(unsigned irq, struct pt_regs *regs);