The patch titled mm: remove the might_sleep() from lock_page() has been removed from the -mm tree. Its filename was mm-remove-the-might_sleep-from-lock_page.patch This patch was dropped because I got tired of it The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mm: remove the might_sleep() from lock_page() From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Arjan reports that hwclock(8) likes to run pagefaults with local interrupts disabled (via sys_iopl()), which causes scary warnings and traces. It's a bug in hwclock, but let's not worry people and create additional bug reports. (Also, adding a migt_sleep() to the inlined, 600-call-site lock_page() wasn't a great idea. A might_sleep() is pretty large.) Reported-by: Arjan van de Ven <arjan@xxxxxxxxxxxxx> Cc: Nick Piggin <nickpiggin@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/pagemap.h | 1 - 1 file changed, 1 deletion(-) diff -puN include/linux/pagemap.h~mm-remove-the-might_sleep-from-lock_page include/linux/pagemap.h --- a/include/linux/pagemap.h~mm-remove-the-might_sleep-from-lock_page +++ a/include/linux/pagemap.h @@ -320,7 +320,6 @@ static inline int trylock_page(struct pa */ static inline void lock_page(struct page *page) { - might_sleep(); if (!trylock_page(page)) __lock_page(page); } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch alpha-fix-vmalloc-breakage.patch revert-mm-vmalloc-use-mutex-for-purge.patch kprobes-fix-module-compilation-error-with-config_kprobes=n-fix.patch lib-idrc-use-kmem_cache_zalloc-for-the-idr_layer-cache.patch hp_accel-do-not-call-acpi-from-invalid-context.patch i-need-old-gcc.patch mm-remove-the-might_sleep-from-lock_page.patch linux-next.patch next-remove-localversion.patch arch-ia64-kernel-ia64_ksymsc-dont-export-copy_page-twice.patch thinkpad-acpi-split-delayed-leds-stuff-clean-up-code-checkpatch-fixes.patch drivers-consolidate-driver_probe_done-loops-into-one-place-fix.patch drivers-consolidate-driver_probe_done-loops-into-one-place-checkpatch-fixes.patch clocksource-pass-clocksource-to-read-callback.patch drivers-ata-pata_alic-s-isa_bridge-ali_isa_bridge-to-fix-alpha-build.patch drivers-net-mlx4-profilec-fix-min-warning.patch pci-quirks-unhide-overflow-device-on-i828675p-pe-chipsets.patch regulator-minor-cleanup-of-virtual-consumer-fix.patch kernel-trace-ring_bufferc-reduce-inlining.patch kernel-trace-ring_bufferc-use-div_round_up.patch raw-fix-rawctl-compat-ioctls-breakage-on-amd64-and-itanic.patch ext2-update-also-inode-on-disk-when-dir-is-is_dirsync.patch scsi-dpt_i2o-is-bust-on-ia64.patch nommu-fix-a-number-of-issues-with-the-per-mm-vma-patch.patch serial-add-supraexpress-336i-pnp-voice-modem-fix.patch page_fault-retry-with-nopage_retry.patch page_fault-retry-with-nopage_retry-fix-3-fix.patch mm-add-proc-controls-for-pdflush-threads-fix.patch mm-add-proc-controls-for-pdflush-threads-fix-fix.patch proc-pid-maps-dont-show-pgoff-of-pure-anon-vmas-checkpatch-fixes.patch rtc-convert-leap_year-into-an-inline.patch rtc-add-platform-driver-for-efi-fix.patch nilfs2-integrated-block-mapping-remove-nilfs-bmap-wrapper-macros-checkpatch-fixes.patch nilfs2-inode-operations-fix.patch nilfs2-pathname-operations-fix.patch nilfs2-super-block-operations-fix.patch reiser4.patch reiser4-remove-simple_prepare_write-usage-checkpatch-fixes.patch slab-leaks3-default-y.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch notify_change-callers-must-hold-i_mutex.patch drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.patch w1-build-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