From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Date: Sat, 7 Nov 2015 00:29:29 +0000 (-0800)
Subject: zsmalloc: use preempt.h for in_interrupt()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=759b26b29885a8ef6101aa554d9990803f6ef792;p=deliverable%2Flinux.git

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

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 1fe9928d0ff1..c4811067bec7 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>