3 files changed, 24 insertions, 4 deletions

diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index bd188f6bd0e2..d0e09684b9ce 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -268,6 +268,19 @@ static noinline __init void setup_lowcore_early(void)
         s390_base_pgm_handler_fn = early_pgm_check_handler;
 }
 
+static noinline __init void setup_hpage(void)
+{
+#ifndef CONFIG_DEBUG_PAGEALLOC
+        unsigned int facilities;
+
+        facilities = stfl();
+        if (!(facilities & (1UL << 23)) || !(facilities & (1UL << 29)))
+                return;
+        machine_flags |= MACHINE_FLAG_HPAGE;
+        __ctl_set_bit(0, 23);
+#endif
+}
+
 static __init void detect_mvpg(void)
 {
 #ifndef CONFIG_64BIT
@@ -360,6 +373,8 @@ static __init void detect_machine_facilities(void)
         facilities = stfl();
         if (facilities & (1 << 28))
                 machine_flags |= MACHINE_FLAG_IDTE;
+        if (facilities & (1 << 23))
+                machine_flags |= MACHINE_FLAG_PFMF;
         if (facilities & (1 << 4))
                 machine_flags |= MACHINE_FLAG_MVCOS;
 #endif
@@ -388,6 +403,7 @@ void __init startup_init(void)
         detect_diag9c();
         detect_diag44();
         detect_machine_facilities();
+        setup_hpage();
         sclp_read_info_early();
         sclp_facilities_detect();
         memsize = sclp_memory_detect();
diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index 9c2c6f7d37e7..1d06961e87b3 100644
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
@@ -129,7 +129,7 @@ startup_continue:
                                         # virtual and never return ...
         .align  16
 .Lentry:.quad   0x0000000180000000,_stext
-.Lctl:  .quad   0x04b50002              # cr0: various things
+.Lctl:  .quad   0x04350002              # cr0: various things
         .quad   0                       # cr1: primary space segment table
         .quad   .Lduct                  # cr2: dispatchable unit control table
         .quad   0                       # cr3: instruction authorization
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 694c6546ce64..2bc70b6e876a 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -749,6 +749,9 @@ static void __init setup_hwcaps(void)
                         elf_hwcap |= 1UL << 6;
         }
 
+        if (MACHINE_HAS_HPAGE)
+                elf_hwcap |= 1UL << 7;
+
         switch (cpuinfo->cpu_id.machine) {
         case 0x9672:
 #if !defined(CONFIG_64BIT)
@@ -872,8 +875,9 @@ void __cpuinit print_cpu_info(struct cpuinfo_S390 *cpuinfo)
 
 static int show_cpuinfo(struct seq_file *m, void *v)
 {
-        static const char *hwcap_str[7] = {
-                "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp"
+        static const char *hwcap_str[8] = {
+                "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp",
+                "edat"
         };
         struct cpuinfo_S390 *cpuinfo;
         unsigned long n = (unsigned long) v - 1;
@@ -888,7 +892,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                                num_online_cpus(), loops_per_jiffy/(500000/HZ),
                                (loops_per_jiffy/(5000/HZ))%100);
                 seq_puts(m, "features\t: ");
-                for (i = 0; i < 7; i++)
+                for (i = 0; i < 8; i++)
                         if (hwcap_str[i] && (elf_hwcap & (1UL << i)))
                                 seq_printf(m, "%s ", hwcap_str[i]);
                 seq_puts(m, "\n");