Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c
index f0305b1189aaeb93c7a7415082e3ab148cb2b615..dbdd33ee010204f0e03c9c1fd48ad30acad59b4c 100644 (file)
--- a/arch/s390/kernel/processor.c
+++ b/arch/s390/kernel/processor.c
@@ -23,7 +23,6 @@ static DEFINE_PER_CPU(struct cpuid, cpu_id);
  */
 void cpu_init(void)
 {
-       struct s390_idle_data *idle = this_cpu_ptr(&s390_idle);
        struct cpuid *id = this_cpu_ptr(&cpu_id);
 
        get_cpu_id(id);
@@ -31,7 +30,6 @@ void cpu_init(void)
        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;