diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-15 20:29:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-15 20:29:29 +0100 |
| commit | a5d53ad243dc3178fa9001d8ab1f19c63f8debd5 (patch) | |
| tree | 0139239f56b2dea497a003b4512a4ba849591306 /arch/arm64/kernel/setup.c | |
| parent | 15fdd2469e03d44975d548a73e689a725e76a5ee (diff) | |
| parent | 8751cf9a6c5f5bf02a2de8a4c025e09b38556df4 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
Conflicts:
Documentation/arm64/tagged-pointers.txt
arch/arm64/Kconfig
arch/arm64/boot/dts/Makefile
arch/arm64/include/asm/arch_timer.h
arch/arm64/include/asm/elf.h
arch/arm64/include/asm/spinlock.h
arch/arm64/kernel/smp.c
Diffstat (limited to 'arch/arm64/kernel/setup.c')
| -rw-r--r-- | arch/arm64/kernel/setup.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 7b881f0a9cd1..8c7e81c0143f 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -58,7 +58,7 @@ unsigned int processor_id; EXPORT_SYMBOL(processor_id); -unsigned int elf_hwcap __read_mostly; +unsigned long elf_hwcap __read_mostly; EXPORT_SYMBOL_GPL(elf_hwcap); #ifdef CONFIG_COMPAT @@ -426,9 +426,6 @@ static int c_show(struct seq_file *m, void *v) #ifdef CONFIG_SMP seq_printf(m, "processor\t: %d\n", i); #endif - seq_printf(m, "BogoMIPS\t: %lu.%02lu\n\n", - loops_per_jiffy / (500000UL/HZ), - loops_per_jiffy / (5000UL/HZ) % 100); } /* dump out the processor features */ |