aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-13 19:44:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-13 19:44:36 -0700
commit668ce0ac707719d866af7e432e518af7b4c575ad (patch)
tree56981174aa46721ef0b4d3710f990153e22dda3a /kernel
parenta1c0cad352520206305b1a3c2658097721454855 (diff)
parentef1f0982540e5f79c8bbf3675bbc0a9734dba3fc (diff)
Merge branch 'systemh-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Pull system.h fixups for less common arch's from Paul Gortmaker: "Here is what is hopefully the last of the system.h related fixups. The fixes for Alpha and ia64 are code relocations consistent with what was done for the more mainstream architectures. Note that the diffstat lines removed vs lines added are not the same since I've fixed some of the whitespace issues in the relocated code blocks. However they are functionally the same. Compile tested locally, plus these two have been in linux-next for a while. There is also a trivial one line system.h related fix for the Tilera arch from Chris Metcalf to fix an implict include.." * 'systemh-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: irq_work: fix compile failure on tile from missing include ia64: populate the cmpxchg header with appropriate code alpha: fix build failures from system.h dismemberment
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 0c56d44b9fd..1588e3b2871 100644
--- a/kernel/irq_work.c
+++ b/kernel/irq_work.c
@@ -11,6 +11,7 @@
#include <linux/irq_work.h>
#include <linux/percpu.h>
#include <linux/hardirq.h>
+#include <linux/irqflags.h>
#include <asm/processor.h>
/*