diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-22 21:07:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-22 21:07:51 -0700 |
| commit | 205b9c9c6eb9c309759ff1e52ffa85ae8965b382 (patch) | |
| tree | 4ca6761d0fd5bc5b04bd2b059bfe8cbd59c067f6 /arch/powerpc/include/asm/mpic_msgr.h | |
| parent | 7e296295437d3e54662e9e217fb20330e3c38f6f (diff) | |
| parent | 446f6d06fab0b49c61887ecbe8286d6aaa796637 (diff) | |
| download | op-kernel-dev-205b9c9c6eb9c309759ff1e52ffa85ae8965b382.zip op-kernel-dev-205b9c9c6eb9c309759ff1e52ffa85ae8965b382.tar.gz | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Benjamin Herrenschmidt:
"Here are a few fixes for powerpc. Note the addition to the generic
irq.h. This is part of a 3-patches regression fix for mpic due to
changes in how IRQ_TYPE_NONE is being handled. Thomas agreed to the
addition of the new IRQ_TYPE_DEFAULT contant, however he hasn't
replied with an Ack to the actual patch yet. I don't to wait much
longer with these patches tho."
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/mpic: Properly set default triggers
irq: Add IRQ_TYPE_DEFAULT for use by PIC drivers
powerpc/mpic: Fix confusion between hw_irq and virq
powerpc/pmac: Don't add_timer() twice
powerpc/eeh: Fix crash caused by null eeh_dev
powerpc/mpc85xx: add MPIC message dts node
powerpc/mpic_msgr: fix offset error when setting mer register
powerpc/mpic_msgr: add lock for MPIC message global variable
powerpc/mpic_msgr: fix compile error when SMP disabled
powerpc: fix build when CONFIG_BOOKE_WDT is enabled
powerpc/85xx: don't call of_platform_bus_probe() twice
Diffstat (limited to 'arch/powerpc/include/asm/mpic_msgr.h')
| -rw-r--r-- | arch/powerpc/include/asm/mpic_msgr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/mpic_msgr.h b/arch/powerpc/include/asm/mpic_msgr.h index 3ec37dc..326d33c 100644 --- a/arch/powerpc/include/asm/mpic_msgr.h +++ b/arch/powerpc/include/asm/mpic_msgr.h @@ -13,6 +13,7 @@ #include <linux/types.h> #include <linux/spinlock.h> +#include <asm/smp.h> struct mpic_msgr { u32 __iomem *base; |
