The patch titled page-migration-only-migrate-pages-if-allocation-in-the-highest-zone-is-possible-fix has been removed from the -mm tree. Its filename was page-migration-only-migrate-pages-if-allocation-in-the-highest-zone-is-possible-fix.patch This patch was dropped because it was folded into page-migration-only-migrate-pages-if-allocation-in-the-highest-zone-is-possible.patch ------------------------------------------------------ Subject: page-migration-only-migrate-pages-if-allocation-in-the-highest-zone-is-possible-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Improve compilation outcomes. Cc: Christoph Lameter <clameter@xxxxxxx> Cc: Hugh Dickins <hugh@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/migrate.h | 2 ++ 1 file changed, 2 insertions(+) diff -puN include/linux/migrate.h~page-migration-only-migrate-pages-if-allocation-in-the-highest-zone-is-possible-fix include/linux/migrate.h --- a/include/linux/migrate.h~page-migration-only-migrate-pages-if-allocation-in-the-highest-zone-is-possible-fix +++ a/include/linux/migrate.h @@ -12,6 +12,7 @@ static inline int vma_migratable(struct { if (vma->vm_flags & (VM_IO|VM_HUGETLB|VM_PFNMAP|VM_RESERVED)) return 0; +#ifdef CONFIG_NUMA /* * Migration allocates pages in the highest zone. If we cannot * do so then migration (at least from node to node) is not @@ -21,6 +22,7 @@ static inline int vma_migratable(struct gfp_zone(mapping_gfp_mask(vma->vm_file->f_mapping)) < policy_zone) return 0; +#endif return 1; } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch slab-introduce-krealloc.patch rm9000-serial-driver.patch add-apply_to_page_range-which-applies-a-function-to-a-pte-range.patch smaps-add-clear_refs-file-to-clear-reference.patch slab-mark-set_up_list3s-__init.patch slub-core.patch mm-optimize-kill_bdev.patch lazy-freeing-of-memory-through-madv_free.patch page-migration-only-migrate-pages-if-allocation-in-the-highest-zone-is-possible.patch page-migration-only-migrate-pages-if-allocation-in-the-highest-zone-is-possible-fix.patch srmcons-fix-kmallocgfp_kernel-inside-spinlock.patch uml-driver-formatting-fixes-fix.patch cache-pipe-buf-page-address-for-non-highmem-arch.patch reduce-size-of-task_struct-on-64-bit-machines.patch mm-shrink-parent-dentries-when-shrinking-slab.patch merge-sys_clone-sys_unshare-nsproxy-and-namespace.patch virtual_eisa_root_init-should-be-__init.patch proc-maps-protection.patch fix-cycladesh-for-x86_64-and-probably-others.patch rtc-add-rtc-rs5c313-driver.patch enlarge-console-name.patch move-die-notifier-handling-to-common-code.patch fix-sscanf-%n-match-at-end-of-input-string.patch parport-dev-driver-model-support.patch add-support-for-deferrable-timers-respun.patch linux-sysdevh-needs-to-include-linux-moduleh.patch time-smp-friendly-alignment-of-struct-clocksource.patch move-timekeeping-code-to-timekeepingc.patch fix-kevents-childs-priority-greediness.patch display-all-possible-partitions-when-the-root-filesystem-failed-to-mount.patch enhance-initcall_debug-measure-latency.patch dtlk-fix-error-checks-in-module_init.patch document-spin_lock_unlocked-rw_lock_unlocked-deprecation.patch upper-32-bits.patch driver-for-the-maxim-ds1wm-a-1-wire-bus-master-asic-core.patch define-and-use-new-eventscpu_lock_acquire-and-cpu_lock_release.patch call-cpu_chain-with-cpu_down_failed-if-cpu_down_prepare-failed-vs-reduce-size-of-task_struct-on-64-bit-machines.patch kthread-dont-depend-on-work-queues-take-2.patch fix-kthread_create-vs-freezer-theoretical-race.patch speedup-divides-by-cpu_power-in-scheduler.patch utimensat-implementation.patch revert-rtc-add-rtc_merge_alarm.patch declare-struct-ktime.patch make-futex_wait-use-an-hrtimer-for-timeout.patch kprobes-the-on-off-knob-thru-debugfs-updated.patch atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-powerpc.patch local_t-powerpc-extension.patch linux-kernel-markers-i386-optimization.patch signal-timer-event-fds-v9-signalfd-core.patch signal-timer-event-fds-v9-timerfd-core.patch signal-timer-event-fds-v9-eventfd-core.patch revoke-core-code-fix-shared-mapping-revoke.patch revoke-wire-up-i386-system-calls.patch x86-serial-convert-legacy-com-ports-to-platform-devices.patch lguest-vs-x86_64-mm-use-per-cpu-variables-for-gdt-pda.patch lguest-the-host-code-vs-x86_64-mm-i386-separate-hardware-defined-tss-from-linux-additions.patch lguest-the-host-code-vs-futex-new-private-futexes.patch fs-convert-core-functions-to-zero_user_page-pass-kmap-type.patch fs-convert-core-functions-to-zero_user_page-fix-2.patch ntfs-use-zero_user_page-fix.patch reiser4-slab-allocators-remove-slab_debug_initial-flag.patch fbdev-hecuba-framebuffer-driver.patch vt-add-color-support-to-the-underline-and-italic-attributes-fix.patch sm501fb-printk-warning-fixes.patch integrity-new-hooks-fix.patch integrity-evm-as-an-integrity-service-provider-tidy.patch integrity-evm-as-an-integrity-service-provider-tidy-fix.patch integrity-evm-as-an-integrity-service-provider-tidy-fix-2.patch integrity-ima-integrity_measure-support-tidy.patch integrity-ima-integrity_measure-support-fix.patch integrity-ima-integrity_measure-support-fix-2.patch integrity-tpm-internal-kernel-interface-tidy.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