Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

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

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index ca070d260af2e166b23b48553b2b6c02dc2a1046..f7f027caaaaacb33b279f76b33f3525374b6ae34 100644 (file)
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -885,6 +885,8 @@ void __init setup_arch(char **cmdline_p)
         */
        setup_hwcaps();
 
+       HPAGE_SHIFT = MACHINE_HAS_HPAGE ? 20 : 0;
+
        /*
         * Create kernel page tables and switch to virtual addressing.
         */