The patch titled Subject: mm, page_alloc: only use per-cpu allocator for irq-safe requests -fix has been added to the -mm tree. Its filename is mm-page_alloc-only-use-per-cpu-allocator-for-irq-safe-requests-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-page_alloc-only-use-per-cpu-allocator-for-irq-safe-requests-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-page_alloc-only-use-per-cpu-allocator-for-irq-safe-requests-fix.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: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx> Subject: mm, page_alloc: only use per-cpu allocator for irq-safe requests -fix fix a dumb mistake and stick to preempt_enable Link: http://lkml.kernel.org/r/20170208143128.25ahymqlyspjcixu@xxxxxxxxxxxxxxxxxxx Signed-off-by: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxxxx> Cc: Vlastimil Babka <vbabka@xxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/page_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN mm/page_alloc.c~mm-page_alloc-only-use-per-cpu-allocator-for-irq-safe-requests-fix mm/page_alloc.c --- a/mm/page_alloc.c~mm-page_alloc-only-use-per-cpu-allocator-for-irq-safe-requests-fix +++ a/mm/page_alloc.c @@ -2517,7 +2517,7 @@ void free_hot_cold_page(struct page *pag } out: - preempt_enable_no_resched(); + preempt_enable(); } /* @@ -2683,7 +2683,7 @@ static struct page *rmqueue_pcplist(stru __count_zid_vm_events(PGALLOC, page_zonenum(page), 1 << order); zone_statistics(preferred_zone, zone); } - preempt_enable_no_resched(); + preempt_enable(); return page; } _ Patches currently in -mm which might be from mgorman@xxxxxxxxxxxxxxxxxxx are mm-page_alloc-split-buffered_rmqueue.patch mm-page_alloc-split-buffered_rmqueue-fix.patch mm-page_alloc-split-alloc_pages_nodemask.patch mm-page_alloc-drain-per-cpu-pages-from-workqueue-context.patch mm-page_alloc-only-use-per-cpu-allocator-for-irq-safe-requests.patch mm-page_alloc-only-use-per-cpu-allocator-for-irq-safe-requests-fix.patch mm-page_alloc-use-static-global-work_struct-for-draining-per-cpu-pages.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