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

Commit 8c027a57 authored by Helge Deller's avatar Helge Deller Committed by Greg Kroah-Hartman
Browse files

parisc: Drop loops_per_jiffy from per_cpu struct 



commit 93346da8ff47cc00f953c7f38a2d6ba11977fc42 upstream.

There is no need to keep a loops_per_jiffy value per cpu. Drop it.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4316b829

arch/parisc/include/asm/processor.h

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ struct cpuinfo_parisc { 
	unsigned long cpu_loc;      /* CPU location from PAT firmware */

	unsigned int state;

	struct parisc_device *dev;

	unsigned long loops_per_jiffy;

};



extern struct system_cpuinfo_parisc boot_cpu_data;

arch/parisc/kernel/processor.c

+2 −3
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ static int __init processor_probe(struct parisc_device *dev) 
	if (cpuid)

		memset(p, 0, sizeof(struct cpuinfo_parisc));



	p->loops_per_jiffy = loops_per_jiffy;

	p->dev = dev;		/* Save IODC data in case we need it */

	p->hpa = dev->hpa.start;	/* save CPU hpa */

	p->cpuid = cpuid;	/* save CPU id */
@@ -440,8 +439,8 @@ show_cpuinfo (struct seq_file *m, void *v) 
		show_cache_info(m);



		seq_printf(m, "bogomips\t: %lu.%02lu\n",

			     cpuinfo->loops_per_jiffy / (500000 / HZ),

			     (cpuinfo->loops_per_jiffy / (5000 / HZ)) % 100);

			     loops_per_jiffy / (500000 / HZ),

			     loops_per_jiffy / (5000 / HZ) % 100);



		seq_printf(m, "software id\t: %ld\n\n",

				boot_cpu_data.pdc.model.sw_id);