diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-02-10 11:26:38 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-02-10 11:26:38 +0100 |
| commit | df9ab9771c64f5229843bfe2a20fe0ee6ac59fc1 (patch) | |
| tree | a091be1024bd76627f78e791e377126e47703b7b /arch/arm/kernel/setup.c | |
| parent | Merge branches 'debug', 'fixes', 'l2c' (early part), 'misc' and 'sa1100' into... (diff) | |
| parent | ARM: kprobes: Fix compilation error caused by superfluous '*' (diff) | |
| download | linux-df9ab9771c64f5229843bfe2a20fe0ee6ac59fc1.tar.xz linux-df9ab9771c64f5229843bfe2a20fe0ee6ac59fc1.zip | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/kernel/setup.c')
| -rw-r--r-- | arch/arm/kernel/setup.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index d13f185e7bd5..e55408e96559 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -1049,6 +1049,15 @@ static int c_show(struct seq_file *m, void *v) seq_printf(m, "model name\t: %s rev %d (%s)\n", cpu_name, cpuid & 15, elf_platform); +#if defined(CONFIG_SMP) + seq_printf(m, "BogoMIPS\t: %lu.%02lu\n", + per_cpu(cpu_data, i).loops_per_jiffy / (500000UL/HZ), + (per_cpu(cpu_data, i).loops_per_jiffy / (5000UL/HZ)) % 100); +#else + seq_printf(m, "BogoMIPS\t: %lu.%02lu\n", + loops_per_jiffy / (500000/HZ), + (loops_per_jiffy / (5000/HZ)) % 100); +#endif /* dump out the processor features */ seq_puts(m, "Features\t: "); |