]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.10-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 17 Sep 2023 18:36:29 +0000 (20:36 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 17 Sep 2023 18:36:29 +0000 (20:36 +0200)
added patches:
parisc-drop-loops_per_jiffy-from-per_cpu-struct.patch

queue-5.10/parisc-drop-loops_per_jiffy-from-per_cpu-struct.patch [new file with mode: 0644]
queue-5.10/series

diff --git a/queue-5.10/parisc-drop-loops_per_jiffy-from-per_cpu-struct.patch b/queue-5.10/parisc-drop-loops_per_jiffy-from-per_cpu-struct.patch
new file mode 100644 (file)
index 0000000..6fa9be8
--- /dev/null
@@ -0,0 +1,50 @@
+From 93346da8ff47cc00f953c7f38a2d6ba11977fc42 Mon Sep 17 00:00:00 2001
+From: Helge Deller <deller@gmx.de>
+Date: Sat, 24 Oct 2020 12:43:11 +0200
+Subject: parisc: Drop loops_per_jiffy from per_cpu struct
+
+From: Helge Deller <deller@gmx.de>
+
+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 |    1 -
+ arch/parisc/kernel/processor.c      |    5 ++---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+--- a/arch/parisc/include/asm/processor.h
++++ b/arch/parisc/include/asm/processor.h
+@@ -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;
+--- a/arch/parisc/kernel/processor.c
++++ b/arch/parisc/kernel/processor.c
+@@ -163,7 +163,6 @@ static int __init processor_probe(struct
+       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 *
+               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);
index 74c85b503753047ef10c2e36c498c13846dd5afa..f3bb66d6ec9a4da56cccabe1daef1c76c5f11d5b 100644 (file)
@@ -403,3 +403,4 @@ ipv6-fix-ip6_sock_set_addr_preferences-typo.patch
 ixgbe-fix-timestamp-configuration-code.patch
 kcm-fix-error-handling-for-sock_dgram-in-kcm_sendmsg.patch
 drm-amd-display-fix-a-bug-when-searching-for-insert_above_mpcc.patch
+parisc-drop-loops_per_jiffy-from-per_cpu-struct.patch