Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bf9636c authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds
Browse files

Revert "ARM: 7830/1: delay: don't bother reporting bogomips in /proc/cpuinfo" 

Commit 9fc2105a ("ARM: 7830/1: delay: don't bother reporting
bogomips in /proc/cpuinfo") breaks audio in python, and probably
elsewhere, with message

  FATAL: cannot locate cpu MHz in /proc/cpuinfo

I'm not the first one to hit it, see for example

  https://theredblacktree.wordpress.com/2014/08/10/fatal-cannot-locate-cpu-mhz-in-proccpuinfo/
  https://devtalk.nvidia.com/default/topic/765800/workaround-for-fatal-cannot-locate-cpu-mhz-in-proc-cpuinf/?offset=1



Reading original changelog, I have to say "Stop breaking working setups.
You know who you are!".

Signed-off-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d753856c

arch/arm/kernel/setup.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -1046,6 +1046,15 @@ static int c_show(struct seq_file *m, void *v) 
		seq_printf(m, "model name\t: %s rev %d (%s)\n",

		seq_printf(m, "model name\t: %s rev %d (%s)\n",

			   cpu_name, cpuid & 15, elf_platform);

			   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 */

		/* dump out the processor features */

		seq_puts(m, "Features\t: ");

		seq_puts(m, "Features\t: ");

arch/arm/kernel/smp.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -387,6 +387,18 @@ asmlinkage void secondary_start_kernel(void) 




void __init smp_cpus_done(unsigned int max_cpus)

void __init smp_cpus_done(unsigned int max_cpus)

{

{

	int cpu;

	unsigned long bogosum = 0;



	for_each_online_cpu(cpu)

		bogosum += per_cpu(cpu_data, cpu).loops_per_jiffy;



	printk(KERN_INFO "SMP: Total of %d processors activated "

	       "(%lu.%02lu BogoMIPS).\n",

	       num_online_cpus(),

	       bogosum / (500000/HZ),

	       (bogosum / (5000/HZ)) % 100);



	hyp_mode_check();

	hyp_mode_check();

}

}