aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Weisbecker <[email protected]>2013-07-29 21:06:21 +0200
committerFrederic Weisbecker <[email protected]>2013-08-14 17:14:52 +0200
commita703f9b72407d9a4e233f4f6aea1a14ab2b74415 (patch)
tree3f1c2b4d6e1d75f5f9c474cebf5420f33e5f0fc5
parent2d4b84739f0acf61f37267b4e80c5bd85fb90a7e (diff)
m68k: hardirq_count() only need preempt_mask.h
The m68k irqflags implementation needs to check hardirq context in some cases. As it is a very low level header file, it's better to include preempt_mask.h rather than hardirq.h when the only purpose is to use irq context APIs. This way we can avoid future header circular dependencies when vtime.h will expand to use static keys. Signed-off-by: Frederic Weisbecker <[email protected]> Cc: Steven Rostedt <[email protected]> Cc: Paul E. McKenney <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Li Zhong <[email protected]> Cc: Mike Galbraith <[email protected]> Cc: Kevin Hilman <[email protected]> Cc: Geert Uytterhoeven <[email protected]>
-rw-r--r--arch/m68k/include/asm/irqflags.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/irqflags.h b/arch/m68k/include/asm/irqflags.h
index 7ef4115b8c4a..4c6275522e67 100644
--- a/arch/m68k/include/asm/irqflags.h
+++ b/arch/m68k/include/asm/irqflags.h
@@ -3,7 +3,7 @@
#include <linux/types.h>
#ifdef CONFIG_MMU
-#include <linux/hardirq.h>
+#include <linux/preempt_mask.h>
#endif
#include <linux/preempt.h>
#include <asm/thread_info.h>