The patch titled Subject: zsmalloc: use preempt.h for in_interrupt() has been added to the -mm tree. Its filename is zsmalloc-use-preempth-for-in_interrupt.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/zsmalloc-use-preempth-for-in_interrupt.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/zsmalloc-use-preempth-for-in_interrupt.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx> Subject: 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@xxxxxxxxx> Acked-by: Minchan Kim <minchan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/zsmalloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/zsmalloc.c~zsmalloc-use-preempth-for-in_interrupt mm/zsmalloc.c --- a/mm/zsmalloc.c~zsmalloc-use-preempth-for-in_interrupt +++ a/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> _ Patches currently in -mm which might be from sergey.senozhatsky@xxxxxxxxx are maintainers-add-myself-as-zsmalloc-reviewer.patch zram-keep-the-exact-overcommited-value-in-mem_used_max.patch mm-zsmalloc-constify-struct-zs_pool-name.patch zsmalloc-use-preempth-for-in_interrupt.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html