The patch titled Subject: mm-cma-fix-boot-regression-due-to-physical-address-of-high_memory-fix has been removed from the -mm tree. Its filename was mm-cma-fix-boot-regression-due-to-physical-address-of-high_memory-fix.patch This patch was dropped because it was folded into mm-cma-fix-boot-regression-due-to-physical-address-of-high_memory.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-cma-fix-boot-regression-due-to-physical-address-of-high_memory-fix tweak comment Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> Cc: Russell King <rmk@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/cma.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff -puN mm/cma.c~mm-cma-fix-boot-regression-due-to-physical-address-of-high_memory-fix mm/cma.c --- a/mm/cma.c~mm-cma-fix-boot-regression-due-to-physical-address-of-high_memory-fix +++ a/mm/cma.c @@ -220,12 +220,11 @@ int __init cma_declare_contiguous(phys_a #ifdef CONFIG_X86 /* - * high_memory isn't direct mapped memory so retrieving it's - * physical address isn't appropriate. But, it would be useful - * to check physical address of highmem boundary so it's - * justfiable to get physical address from it. In x86, there is - * a validation check for this case, so following workaround is - * needed to avoid it. + * high_memory isn't direct mapped memory so retrieving its physical + * address isn't appropriate. But it would be useful to check the + * physical address of the highmem boundary so it's justfiable to get + * the physical address from it. On x86 there is a validation check for + * this case, so the following workaround is needed to avoid it. */ highmem_start = __pa_nodebug(high_memory); #else _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch mm-cma-fix-boot-regression-due-to-physical-address-of-high_memory.patch slab-improve-checking-for-invalid-gfp_flags.patch mm-memcontrol-lockless-page-counters-fix.patch mm-memcontrol-lockless-page-counters-fix-fix.patch kernel-res_counter-remove-the-unused-api-fix.patch mm-compaction-simplify-deferred-compaction-fix.patch mm-compaction-always-update-cached-scanner-positions-fix-checkpatch-fixes.patch mm-memcontrol-remove-unnecessary-pcg_used-pc-mem_cgroup-valid-flag-fix.patch mm-memcontrol-fold-mem_cgroup_start_move-mem_cgroup_end_move-fix.patch mm-fix-huge-zero-page-accounting-in-smaps-report-fix-2-fix.patch fs-proc-use-a-rb-tree-for-the-directory-entries-fix.patch fs-binfmt_miscc-use-gfp_kernel-instead-of-gfp_user.patch init-allow-config_init_fallback=n-to-disable-defaults-if-init=-fails-checkpatch-fixes.patch rtc-omap-add-support-for-pmic_power_en-v3-fix.patch drivers-rtc-rtc-sirfsocc-add-alarm_irq_enable-support-fix.patch rtc-ds1374-add-watchdog-support-fix.patch rtc-ds1374-add-watchdog-support-checkpatch-fixes.patch exit-wait-cleanup-the-ptrace_reparented-checks-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