irqbalance: Fix compile issue with none AARCH64 builds

Fix compile issue with none AARCH64 builds

Signed-off-by: qinyu <qinyu32@huawei.com>
This commit is contained in:
qinyu 2023-01-05 15:28:12 +08:00
parent 4e87047d4a
commit 3a9655c20f
2 changed files with 57 additions and 1 deletions

View File

@ -0,0 +1,49 @@
From ee6b3bdd15fdbaf5d6060c3c2df4e7e69dafbd06 Mon Sep 17 00:00:00 2001
From: Michael Neuling <mikey@neuling.org>
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 <mikey@neuling.org>
---
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

View File

@ -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 <qinyu32@huawei.com> - 3:1.7.0-13
- Type:bugfix
- ID:NA
- SUG:restart
- DESC: Fix compile issue with none AARCH64 builds
* Thu Jan 5 2023 qinyu <qinyu32@huawei.com> - 3:1.7.0-12
- Type:bugfix
- ID:NA