From 759b26b29885a8ef6101aa554d9990803f6ef792 Mon Sep 17 00:00:00 2001 From: Sergey Senozhatsky Date: Fri, 6 Nov 2015 16:29:29 -0800 Subject: [PATCH] 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 Acked-by: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- mm/zsmalloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 #include #include -#include +#include #include #include #include -- 2.20.1