Subject: [to-be-updated] memblock-factor-out-of-top-down-allocation-hack.patch removed from -mm tree To: akpm@xxxxxxxxxxxxxxxxxxxx,tangchen@xxxxxxxxxxxxxx,zhangyanfei@xxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 03 Oct 2013 11:59:28 -0700 The patch titled Subject: memblock-factor-out-of-top-down-allocation-hack has been removed from the -mm tree. Its filename was memblock-factor-out-of-top-down-allocation-hack.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: memblock-factor-out-of-top-down-allocation-hack make it build on non-x86 Cc: Tang Chen <tangchen@xxxxxxxxxxxxxx> Cc: Zhang Yanfei <zhangyanfei@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memblock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff -puN mm/memblock.c~memblock-factor-out-of-top-down-allocation-hack mm/memblock.c --- a/mm/memblock.c~memblock-factor-out-of-top-down-allocation-hack +++ a/mm/memblock.c @@ -187,8 +187,11 @@ phys_addr_t __init_memblock memblock_fin /* avoid allocating the first page */ start = max_t(phys_addr_t, start, PAGE_SIZE); end = max(start, end); +#ifdef CONFIG_X86 kernel_end = __pa_symbol(_end); - +#else + kernel_end = __pa(RELOC_HIDE((unsigned long)(_end), 0)); +#endif /* * try bottom-up allocation only when bottom-up mode * is set and @end is above the kernel image. _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch arch-alpha-kernel-systblss-remove-debug-check.patch i-need-old-gcc.patch kernel-time-tick-commonc-document-tick_do_timer_cpu.patch makefile-enable-werror=implicit-int-and-werror=strict-prototypes-by-default.patch mm-readaheadc-do_readhead-dont-check-for-readpage.patch mm.patch mm-thp-khugepaged-add-policy-for-finding-target-node-fix.patch kernel-printk-printkc-convert-to-pr_foo.patch checkpatch-extend-camelcase-types-and-ignore-existing-camelcase-uses-in-a-patch.patch checkpatch-add-test-for-defines-of-arch_has_foo.patch binfmt_elfc-use-get_random_int-to-fix-entropy-depleting.patch fat-additions-to-support-fat_fallocate.patch fat-additions-to-support-fat_fallocate-v6-checkpatch-fixes.patch gcov-add-support-for-gcc-47-gcov-format-fix.patch gcov-add-support-for-gcc-47-gcov-format-fix-fix.patch gcov-add-support-for-gcc-47-gcov-format-checkpatch-fixes.patch kernel-modulec-use-pr_foo.patch kernel-gcov-fsc-use-pr_warn.patch linux-next.patch linux-next-git-rejects.patch x86-mm-factor-out-of-top-down-direct-mapping-setup-next-fix.patch mm-drop-actor-argument-of-do_generic_file_read-fix.patch debugging-keep-track-of-page-owners-fix-2-fix.patch debugging-keep-track-of-page-owners-fix-2-fix-fix-fix.patch journal_add_journal_head-debug.patch kernel-forkc-export-kernel_thread-to-modules.patch mutex-subsystem-synchro-test-module.patch slab-leaks3-default-y.patch put_bh-debug.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