]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
parisc: Drop loops_per_jiffy from per_cpu struct
authorHelge Deller <deller@gmx.de>
Sat, 24 Oct 2020 10:43:11 +0000 (12:43 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Sep 2023 08:47:03 +0000 (10:47 +0200)
commit 93346da8ff47cc00f953c7f38a2d6ba11977fc42 upstream.

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

Signed-off-by: Helge Deller <deller@gmx.de>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/parisc/include/asm/processor.h
arch/parisc/kernel/processor.c

index 2dbe5580a1a4420ba693329a0f2622f68f759276..d98f4cb549b9e3d834a5756f8c96b51bb36bc886 100644 (file)
@@ -108,7 +108,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;
index 663ff1658cd5ff7547166ee752e601217cb27658..e87bb36b3fcaedaff7a95f764a2892260c6039e0 100644 (file)
@@ -177,7 +177,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 */
@@ -429,8 +428,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);