The patch titled x86-lockless-get_user_pages_fast-fix-2 has been removed from the -mm tree. Its filename was x86-lockless-get_user_pages_fast-fix-2.patch This patch was dropped because it was folded into x86-lockless-get_user_pages_fast.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: x86-lockless-get_user_pages_fast-fix-2 From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Andi Kleen <andi@xxxxxxxxxxxxxx> Cc: Andy Whitcroft <apw@xxxxxxxxxxxx> Cc: Badari Pulavarty <pbadari@xxxxxxxxxx> Cc: Dave Kleikamp <shaggy@xxxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Jens Axboe <jens.axboe@xxxxxxxxxx> Cc: Nick Piggin <npiggin@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Zach Brown <zach.brown@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/Kconfig | 1 + include/asm-x86/uaccess.h | 2 -- mm/Kconfig | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff -puN arch/x86/Kconfig~x86-lockless-get_user_pages_fast-fix-2 arch/x86/Kconfig --- a/arch/x86/Kconfig~x86-lockless-get_user_pages_fast-fix-2 +++ a/arch/x86/Kconfig @@ -22,6 +22,7 @@ config X86 select HAVE_IDE select HAVE_OPROFILE select HAVE_IOREMAP_PROT + select HAVE_GET_USER_PAGES_FAST select HAVE_KPROBES select ARCH_WANT_OPTIONAL_GPIOLIB if !X86_RDC321X select HAVE_KRETPROBES diff -puN include/asm-x86/uaccess.h~x86-lockless-get_user_pages_fast-fix-2 include/asm-x86/uaccess.h --- a/include/asm-x86/uaccess.h~x86-lockless-get_user_pages_fast-fix-2 +++ a/include/asm-x86/uaccess.h @@ -452,5 +452,3 @@ extern struct movsl_mask { #endif -#define __HAVE_ARCH_GET_USER_PAGES_FAST - diff -puN mm/Kconfig~x86-lockless-get_user_pages_fast-fix-2 mm/Kconfig --- a/mm/Kconfig~x86-lockless-get_user_pages_fast-fix-2 +++ a/mm/Kconfig @@ -77,6 +77,9 @@ config FLAT_NODE_MEM_MAP def_bool y depends on !SPARSEMEM +config HAVE_GET_USER_PAGES_FAST + bool + # # Both the NUMA code and DISCONTIGMEM use arrays of pg_data_t's # to represent different areas of memory. This variable allows _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch uninline-arch_pick_mmap_layout.patch dma-mapping-add-the-device-argument-to-dma_mapping_error.patch x86-calgary-fix-handling-of-devices-that-arent-behind-the-calgary.patch tpm-increase-size-of-internal-tpm-response-buffers.patch memstick-allow-set_param-method-to-return-an-error-code.patch memstick-use-fully-asynchronous-request-processing.patch full-conversion-to-early_initcall-interface-remove-old-interface.patch mm-introduce-get_user_pages_fast.patch x86-lockless-get_user_pages_fast.patch x86-lockless-get_user_pages_fast-fix-2.patch x86-lockless-get_user_pages_fast-fix-2-fix-fix.patch x86-lockless-get_user_pages_fast-fix-warning.patch mm-speculative-page-references-fix-add_to_page_cache-fix.patch vmscan-move-isolate_lru_page-to-vmscanc-fix.patch define-page_file_cache-function-fix.patch vmscan-split-lru-lists-into-anon-file-sets-units-fix.patch unevictable-lru-infrastructure-fix.patch unevictable-lru-page-statistics-units-fix.patch mlock-mlocked-pages-are-unevictable-fix.patch mlock-mlocked-pages-are-unevictable-fix-fix.patch mlock-mlocked-pages-are-unevictable-fix-3.patch mmap-handle-mlocked-pages-during-map-remap-unmap-cleanup.patch introduce-__get_user_pages-fix.patch vmscan-unevictable-lru-scan-sysctl-nommu-fix.patch slb-drop-kmem-cache-argument-from-constructor-fix.patch slb-drop-kmem-cache-argument-from-constructor-fix-fix.patch slb-drop-kmem-cache-argument-from-constructor-fix-fix-logfs.patch slb-drop-kmem-cache-argument-from-constructor-ubifs.patch video-console-sticonrec-make-code-static-checkpatch-fixes.patch reiser4.patch reiser4-tree_lock-fixes.patch reiser4-tree_lock-fixes-fix.patch reiser4-semaphore-fix.patch slb-drop-kmem-cache-argument-from-constructor-reiser4.patch reiser4-suid.patch page-owner-tracking-leak-detector.patch nr_blockdev_pages-in_interrupt-warning.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 profile-likely-unlikely-macros.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