diff options
| author | James Simmons <jsimmons@infradead.org> | 2012-07-16 01:57:59 +0100 |
|---|---|---|
| committer | James Simmons <jsimmons@infradead.org> | 2012-07-16 01:57:59 +0100 |
| commit | e22956a2faa9cf34cec4a471131d50c6be75b0c2 (patch) | |
| tree | 711e907ded2c7fd024de24e57073d292296b3fd7 /arch/powerpc/include/asm/hw_irq.h | |
| parent | 9491e34defaa03e18241e1e65352eb7c1d7215ed (diff) | |
| parent | 49099c4991da3c94773f888aea2e9d27b8a7c6d1 (diff) | |
Merge branch 'drm-core-next'
Diffstat (limited to 'arch/powerpc/include/asm/hw_irq.h')
| -rw-r--r-- | arch/powerpc/include/asm/hw_irq.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h index 51010bfc792..32b394f3b85 100644 --- a/arch/powerpc/include/asm/hw_irq.h +++ b/arch/powerpc/include/asm/hw_irq.h @@ -33,6 +33,7 @@ extern void __replay_interrupt(unsigned int vector); extern void timer_interrupt(struct pt_regs *); +extern void performance_monitor_exception(struct pt_regs *regs); #ifdef CONFIG_PPC64 #include <asm/paca.h> @@ -99,6 +100,9 @@ static inline void hard_irq_disable(void) get_paca()->irq_happened |= PACA_IRQ_HARD_DIS; } +/* include/linux/interrupt.h needs hard_irq_disable to be a macro */ +#define hard_irq_disable hard_irq_disable + /* * This is called by asynchronous interrupts to conditionally * re-enable hard interrupts when soft-disabled after having |