From 2551ae90e3c9a2fbc12d3f568ce0b2869a25a570 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Wed, 29 Aug 2012 14:54:38 +0200 Subject: [PATCH] --- yaml --- r: 324075 b: refs/heads/master c: fbf3c54239f77a82218002e0c511819e274e7cd4 h: refs/heads/master i: 324073: a60aafed68f229fb7ba5575065167e3b311a089b 324071: 6d16d43735e08a5b0ed01389d8347971aeb74a3c v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/processor.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e93ea0615b2f..9f705c3dabb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6668022c7bde3fdc96d3d257294a7216c7a46829 +refs/heads/master: fbf3c54239f77a82218002e0c511819e274e7cd4 diff --git a/trunk/arch/s390/kernel/processor.c b/trunk/arch/s390/kernel/processor.c index 63f3b76e37a9..753c41d0ffd3 100644 --- a/trunk/arch/s390/kernel/processor.c +++ b/trunk/arch/s390/kernel/processor.c @@ -39,7 +39,7 @@ void __cpuinit cpu_init(void) */ static int show_cpuinfo(struct seq_file *m, void *v) { - static const char *hwcap_str[11] = { + static const char *hwcap_str[] = { "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp", "edat", "etf3eh", "highgprs", "te" }; @@ -54,7 +54,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 < 11; i++) + for (i = 0; i < ARRAY_SIZE(hwcap_str); i++) if (hwcap_str[i] && (elf_hwcap & (1UL << i))) seq_printf(m, "%s ", hwcap_str[i]); seq_puts(m, "\n");