The patch titled debug-pagealloc-add-support-for-highmem-pages-fix has been added to the -mm tree. Its filename is debug-pagealloc-add-support-for-highmem-pages-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 *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: debug-pagealloc-add-support-for-highmem-pages-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> remove unneeded preempt_disable/enable Cc: Akinobu Mita <akinobu.mita@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/debug-pagealloc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff -puN mm/debug-pagealloc.c~debug-pagealloc-add-support-for-highmem-pages-fix mm/debug-pagealloc.c --- a/mm/debug-pagealloc.c~debug-pagealloc-add-support-for-highmem-pages-fix +++ a/mm/debug-pagealloc.c @@ -23,14 +23,11 @@ static inline bool page_poison(struct pa static void poison_page(struct page *page) { - void *addr; + void *addr = kmap_atomic(page); - preempt_disable(); - addr = kmap_atomic(page); set_page_poison(page); memset(addr, PAGE_POISON, PAGE_SIZE); kunmap_atomic(addr); - preempt_enable(); } static void poison_pages(struct page *page, int n) @@ -82,12 +79,10 @@ static void unpoison_page(struct page *p if (!page_poison(page)) return; - preempt_disable(); addr = kmap_atomic(page); check_poison_mem(addr, PAGE_SIZE); clear_page_poison(page); kunmap_atomic(addr); - preempt_enable(); } static void unpoison_pages(struct page *page, int n) _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch headers_check-is-broken.patch samples-hidraw-is-busted.patch alpha-unbreak-osf_setsysinfossi_nvpairs.patch linux-next.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch numa-fix-numa-compile-error-when-sysfs-and-procfs-are-disabled-fix.patch kernel-timec-change-jiffies_to_clock_t-input-parameters-type-to-unsigned-long.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch leds-new-pcengines-alix-system-driver-enables-leds-via-gpio-interface-fix.patch kernel-rtmutexc-fix-warning-improve-coding-style.patch drivers-message-fusion-mptbasec-ensure-nul-termination-of-mptcallbacksname-elements-checkpatch-fixes.patch mm.patch mm-vmscan-fix-force-scanning-small-targets-without-swap-fix.patch mm-add-comments-to-explain-mm_struct-fields-fix.patch vmscan-use-atomic-long-for-shrinker-batching-fix.patch mm-avoid-null-pointer-access-in-vm_struct-via-proc-vmallocinfo.patch thp-mremap-support-and-tlb-optimization-fix.patch thp-mremap-support-and-tlb-optimization-fix-fix.patch mm-neaten-warn_alloc_failed-fix.patch debug-pagealloc-add-support-for-highmem-pages-fix.patch include-linux-securityh-fix-security_inode_init_security-arg.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch hpet-factor-timer-allocate-from-open.patch printk-add-module-parameter-ignore_loglevel-to-control-ignore_loglevel-fix-fix.patch fs-nameic-remove-unused-getname_flags.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch leds-route-kbd-leds-through-the-generic-leds-layer-fix.patch lib-crc-add-slice-by-8-algorithm-to-crc32c-fix.patch lib-hexdumpc-make-hex2bin-return-the-updated-src-address.patch fs-binfmt_miscc-use-kernels-hex_to_bin-method-fix.patch fs-binfmt_miscc-use-kernels-hex_to_bin-method-fix-fix.patch ipc-introduce-shm_rmid_forced-sysctl-testing.patch nbd-replace-some-printk-with-dev_warn-and-dev_info-checkpatch-fixes.patch pps-new-client-driver-using-gpio-fix.patch scatterlist-new-helper-functions.patch scatterlist-new-helper-functions-update-fix.patch memstick-add-support-for-legacy-memorysticks-fix.patch kexec-remove-kmsg_dump_kexec.patch journal_add_journal_head-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch memblock-add-input-size-checking-to-memblock_find_region.patch memblock-add-input-size-checking-to-memblock_find_region-fix.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