Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-2.6-microblaze.git] / arch / s390 / kernel / setup.c

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 878cacf..e600f69 100644 (file)
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -1099,6 +1099,7 @@ void __init setup_arch(char **cmdline_p)
        if (IS_ENABLED(CONFIG_EXPOLINE_AUTO))
                nospec_auto_detect();
 
+       jump_label_init();
        parse_early_param();
 #ifdef CONFIG_CRASH_DUMP
        /* Deactivate elfcorehdr= kernel parameter */
@@ -1125,14 +1126,6 @@ void __init setup_arch(char **cmdline_p)
        free_mem_detect_info();
        remove_oldmem();
 
-       /*
-        * Make sure all chunks are MAX_ORDER aligned so we don't need the
-        * extra checks that HOLES_IN_ZONE would require.
-        *
-        * Is this still required?
-        */
-       memblock_trim_memory(1UL << (MAX_ORDER - 1 + PAGE_SHIFT));
-
        if (is_prot_virt_host())
                setup_uv();
        setup_memory_end();