summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-02 14:41:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-02 14:41:43 -0700
commit95694129b43165911dc4e8a972f0d39ad98d86be (patch)
treea7faf4b70c85b457f684cbc1033ac5b79457c2e9 /kernel
parentb1a808ff436343956a6ae63178ea1810c5e5a3a1 (diff)
parent80da6a4feeb9e4d6554f771f14f5b994e6c6c7e8 (diff)
downloadlinux-stable-95694129b43165911dc4e8a972f0d39ad98d86be.tar.gz
linux-stable-95694129b43165911dc4e8a972f0d39ad98d86be.tar.bz2
linux-stable-95694129b43165911dc4e8a972f0d39ad98d86be.zip
Merge branch 'paul' (Fixups from Paul Gortmaker)
This merges some of the fixes from Paul Gortmaker for the header file cleanup fallout. Some of the patches are going through arch maintainer trees, and David Howells suggested another be done differently, but this at least fixes a few cases. * emailed from Paul Gortmaker <paul.gortmaker@windriver.com>: asm-generic: add linux/types.h to cmpxchg.h firewire: restore the device.h include in linux/firewire.h frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL parisc: fix missing cmpxchg file error from system.h split blackfin: fix cmpxchg build fails from system.h fallout avr32: fix build failures from mis-naming of atmel_nand.h ARM: mach-msm: fix compile fail from system.h fallout irq_work: fix compile failure on MIPS from system.h split
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq_work.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/irq_work.c b/kernel/irq_work.c
index c3c46c72046e..0c56d44b9fd5 100644
--- a/kernel/irq_work.c
+++ b/kernel/irq_work.c
@@ -5,6 +5,7 @@
* context. The enqueueing is NMI-safe.
*/
+#include <linux/bug.h>
#include <linux/kernel.h>
#include <linux/export.h>
#include <linux/irq_work.h>