summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2010-11-11 14:05:10 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-12 07:55:30 -0800
commit43b3a0c732776746f53d8ed2ba659583fc1692aa (patch)
treed72a9778374061bbdb1865f60c6cacce7eacb3b9 /include
parent3f9d35b9514da6757ca98831372518f9eeb71b33 (diff)
downloadlinux-43b3a0c732776746f53d8ed2ba659583fc1692aa.tar.gz
include/linux/highmem.h needs hardirq.h
Commit 3e4d3af501cc ("mm: stack based kmap_atomic()") introduced the
kmap_atomic_idx_push() function which warns on in_irq() with
CONFIG_DEBUG_HIGHMEM enabled.  This patch includes linux/hardirq.h for
the in_irq definition.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/highmem.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index e9138198e823..b676c585574e 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -5,6 +5,7 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/uaccess.h>
+#include <linux/hardirq.h>
 
 #include <asm/cacheflush.h>