From 3a9655c20ff39a6df2736b398c9a3876fecc728d Mon Sep 17 00:00:00 2001 From: qinyu Date: Thu, 5 Jan 2023 15:28:12 +0800 Subject: [PATCH] irqbalance: Fix compile issue with none AARCH64 builds Fix compile issue with none AARCH64 builds Signed-off-by: qinyu --- ...mpile-issue-with-none-AARCH64-builds.patch | 49 +++++++++++++++++++ irqbalance.spec | 9 +++- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 backport-Fix-compile-issue-with-none-AARCH64-builds.patch diff --git a/backport-Fix-compile-issue-with-none-AARCH64-builds.patch b/backport-Fix-compile-issue-with-none-AARCH64-builds.patch new file mode 100644 index 0000000..b60f93a --- /dev/null +++ b/backport-Fix-compile-issue-with-none-AARCH64-builds.patch @@ -0,0 +1,49 @@ +From ee6b3bdd15fdbaf5d6060c3c2df4e7e69dafbd06 Mon Sep 17 00:00:00 2001 +From: Michael Neuling +Date: Wed, 28 Apr 2021 10:24:05 +1000 +Subject: [PATCH] Fix compile issue with none AARCH64 builds +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This recent commit broke compiling on non AARCH64 architectures: + commit d17bcc953c513f93553f531e5444553f2bf6ca46 + Author: liuchao173 <55137861+liuchao173@users.noreply.github.com> + Date: Tue Apr 27 15:36:30 2021 +0800 + Fix irqbalance cannot obtain the full name of irq + +This results in: + procinterrupts.c:186:11: error: ‘irq_fullname’ undeclared (first use in this function); did you mean ‘irq_name’? + 186 | snprintf(irq_fullname, PATH_MAX, "%s", last_token); + | ^~~~~~~~~~~~ + | irq_name + procinterrupts.c:186:11: note: each undeclared identifier is reported only once for each function it appears in + +This fixes it. + +Reference:https://github.com/Irqbalance/irqbalance/commit/ee6b3bdd15fdbaf5d6060c3c2df4e7e69dafbd06 +Conflict:NA + +Signed-off-by: Michael Neuling +--- + procinterrupts.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/procinterrupts.c b/procinterrupts.c +index 8673f2d..e372671 100644 +--- a/procinterrupts.c ++++ b/procinterrupts.c +@@ -152,9 +152,9 @@ void init_irq_class_and_type(char *savedline, struct irq_info *info, int irq) + char *last_token = NULL; + char *p = NULL; + int is_xen_dyn = 0; ++ char irq_fullname[PATH_MAX] = {0}; + #ifdef AARCH64 + char *tmp = NULL; +- char irq_fullname[PATH_MAX] = {0}; + #endif + + irq_name = strtok_r(savedline, " ", &savedptr); +-- +2.23.0 + diff --git a/irqbalance.spec b/irqbalance.spec index 74999fc..b145afe 100644 --- a/irqbalance.spec +++ b/irqbalance.spec @@ -1,7 +1,7 @@ Summary: A dynamic adaptive IRQ balancing daemon Name: irqbalance Version: 1.7.0 -Release: 12 +Release: 13 Epoch: 3 License: GPLv2 Source0: https://github.com/Irqbalance/irqbalance/archive/irqbalance-%{version}.tar.gz @@ -31,6 +31,7 @@ Patch6006: backport-Also-fetch-node-info-for-non-PCI-devices.patch Patch6007: backport-Hotplug-may-occur-again-during-sleep-so-wait-until-t.patch Patch6008: backport-Add-return-value-check-of-opendir-in-do_one_cpu.patch Patch6009: backport-Fix-irqbalance-cannot-obtain-the-full-name-of-irq.patch +Patch6010: backport-Fix-compile-issue-with-none-AARCH64-builds.patch %description Irqbalance is a daemon to help balance the cpu load generated by @@ -88,6 +89,12 @@ fi /sbin/chkconfig --del %{name} >/dev/null 2>&1 || : %changelog +* Thu Jan 5 2023 qinyu - 3:1.7.0-13 +- Type:bugfix +- ID:NA +- SUG:restart +- DESC: Fix compile issue with none AARCH64 builds + * Thu Jan 5 2023 qinyu - 3:1.7.0-12 - Type:bugfix - ID:NA