summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Senozhatsky <sergey.senozhatsky@gmail.com>2015-11-07 00:29:29 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-07 01:50:42 (GMT)
commit759b26b29885a8ef6101aa554d9990803f6ef792 (patch)
tree7a16991c990dc202594e71fa420bbf703099f921
parent12a7bfad58cd604616dd5205efa6dc2be6f299eb (diff)
downloadlinux-759b26b29885a8ef6101aa554d9990803f6ef792.tar.xz
zsmalloc: use preempt.h for in_interrupt()
A cosmetic change. Commit c60369f01125 ("staging: zsmalloc: prevent mappping in interrupt context") added in_interrupt() check to zs_map_object() and 'hardirq.h' include; but in_interrupt() macro is defined in 'preempt.h' not in 'hardirq.h', so include it instead. Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Acked-by: Minchan Kim <minchan@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/zsmalloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 1fe9928..c481106 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -59,7 +59,7 @@
#include <linux/cpumask.h>
#include <linux/cpu.h>
#include <linux/vmalloc.h>
-#include <linux/hardirq.h>
+#include <linux/preempt.h>
#include <linux/spinlock.h>
#include <linux/types.h>
#include <linux/debugfs.h>