Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1246722 > unrolled thread

[PATCH] zsmalloc: use preempt.h for in_interrupt()

Back to article view | Back to linux.kernel

Contents

  [PATCH] zsmalloc: use preempt.h for in_interrupt() Sergey Senozhatsky <sergey.senozhatsky@gmail.com> - 2015-10-14 15:20 +0200
    Re: [PATCH] zsmalloc: use preempt.h for in_interrupt() Minchan Kim <minchan@kernel.org> - 2015-10-15 04:30 +0200

#1246722 — [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 <sergey.senozhatsky@gmail.com>
---
 mm/zsmalloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 7ad5e54..4d5671d 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -58,7 +58,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>
-- 
2.6.1.134.g4b1fd35

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1247346

On Wed, Oct 14, 2015 at 10:13:20PM +0900, Sergey Senozhatsky wrote:
> 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>
 
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web