1 files changed, 2 insertions, 4 deletions

diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c
index 24612029f450..dbdd33ee0102 100644
--- a/arch/s390/kernel/processor.c
+++ b/arch/s390/kernel/processor.c
@@ -23,15 +23,13 @@ static DEFINE_PER_CPU(struct cpuid, cpu_id);
  */
 void cpu_init(void)
 {
-        struct s390_idle_data *idle = &__get_cpu_var(s390_idle);
-        struct cpuid *id = &__get_cpu_var(cpu_id);
+        struct cpuid *id = this_cpu_ptr(&cpu_id);
 
         get_cpu_id(id);
         atomic_inc(&init_mm.mm_count);
         current->active_mm = &init_mm;
         BUG_ON(current->mm);
         enter_lazy_tlb(&init_mm, current);
-        memset(idle, 0, sizeof(*idle));
 }
 
 /*
@@ -41,7 +39,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 {
         static const char *hwcap_str[] = {
                 "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp",
-                "edat", "etf3eh", "highgprs", "te"
+                "edat", "etf3eh", "highgprs", "te", "vx"
         };
         unsigned long n = (unsigned long) v - 1;
         int i;