From: Catalin Marinas <catalin.marinas@arm.com>
Date: Thu, 11 Nov 2010 22:05:10 +0000 (-0800)
Subject: include/linux/highmem.h needs hardirq.h
X-Git-Tag: v2.6.37-rc2~65
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=43b3a0c732776746f53d8ed2ba659583fc1692aa;p=~shefty%2Frdma-dev.git

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>
---

diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index e9138198e82..b676c585574 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>