Resolves: bz1411554

This commit is contained in:
Petr Holasek 2017-01-22 12:04:02 +01:00
parent 271d4e912a
commit d5e9425af9
5 changed files with 24 additions and 28 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ irqbalance-0.56.tbz2
/v1.0.8.tar.gz /v1.0.8.tar.gz
/v1.0.9.tar.gz /v1.0.9.tar.gz
/irqbalance-1.1.0.tar.gz /irqbalance-1.1.0.tar.gz
/irqbalance-1.2.0.tar.gz

View File

@ -0,0 +1,13 @@
diff -up irqbalance-1.2.0/procinterrupts.c.orig irqbalance-1.2.0/procinterrupts.c
--- irqbalance-1.2.0/procinterrupts.c.orig 2017-01-13 08:19:20.737858470 +0100
+++ irqbalance-1.2.0/procinterrupts.c 2017-01-13 08:19:51.297986428 +0100
@@ -148,6 +148,9 @@ GList* collect_full_irq_list()
char *line = NULL;
size_t size = 0;
char *irq_name, *irq_mod, *savedptr, *last_token, *p;
+#ifdef AARCH64
+ char *tmp;
+#endif
file = fopen("/proc/interrupts", "r");
if (!file)

View File

@ -1,22 +0,0 @@
diff --git a/procinterrupts.c b/procinterrupts.c
index 63101d6..b70bfc2 100644
--- a/procinterrupts.c
+++ b/procinterrupts.c
@@ -80,7 +80,7 @@ static int check_platform_device(char *name, struct irq_info *info)
rc = 0;
goto out;
} else if (!strncmp(ent->d_name, "net", strlen("net"))) {
- info->IRQ_TYPE_LEGACY;
+ info->type = IRQ_TYPE_LEGACY;
info->class = IRQ_ETH;
rc = 0;
goto out;
@@ -94,7 +94,7 @@ static int check_platform_device(char *name, struct irq_info *info)
out:
closedir(dirfd);
- log(TO_ALL, LOG_DEBUG, "IRQ %s is of type %d and class %d\n", name, info->type, info->class)
+ log(TO_ALL, LOG_DEBUG, "IRQ %s is of type %d and class %d\n", name, info->type, info->class);
return rc;
}

View File

@ -1,6 +1,6 @@
Name: irqbalance Name: irqbalance
Version: 1.1.0 Version: 1.2.0
Release: 3%{?dist} Release: 1%{?dist}
Epoch: 2 Epoch: 2
Summary: IRQ balancing daemon Summary: IRQ balancing daemon
@ -11,8 +11,9 @@ Source0: https://github.com/Irqbalance/irqbalance/archive/irqbalance-%{ve
Source1: irqbalance.sysconfig Source1: irqbalance.sysconfig
BuildRequires: autoconf automake libtool libcap-ng BuildRequires: autoconf automake libtool libcap-ng
BuildRequires: glib2-devel pkgconfig libcap-ng-devel BuildRequires: glib2-devel pkgconf libcap-ng-devel
BuildRequires: systemd BuildRequires: systemd ncurses-devel
Requires: ncurses-libs
%ifnarch %{arm} %ifnarch %{arm}
BuildRequires: numactl-devel BuildRequires: numactl-devel
Requires: numactl-libs Requires: numactl-libs
@ -23,7 +24,7 @@ Requires: numactl-libs
ExcludeArch: s390 s390x ExcludeArch: s390 s390x
Patch1: irqbalance-1.0.4-env-file-path.patch Patch1: irqbalance-1.0.4-env-file-path.patch
Patch2: irqbalance-fix-aarch64.patch Patch2: irqbalance-1.2.0-aarch64-fix.patch
%description %description
irqbalance is a daemon that evenly distributes IRQ load across irqbalance is a daemon that evenly distributes IRQ load across
@ -70,6 +71,9 @@ fi
/sbin/chkconfig --del irqbalance >/dev/null 2>&1 || : /sbin/chkconfig --del irqbalance >/dev/null 2>&1 || :
%changelog %changelog
* Fri Jan 13 2017 Petr Holasek <holasekp@gmail.com> - 2:1.2.0-1
- Rebased to v1.2.0 (bz1411554)
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.1.0-3 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2:1.1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

View File

@ -1 +1 @@
b15d975336080bcac4be0c1752d43cf3 irqbalance-1.1.0.tar.gz SHA512 (irqbalance-1.2.0.tar.gz) = 02510d0d4dc069570b5f98f3b8191384593a6ed9a88c65c87f5a4261f375c291d95c401b01c03ef9d80834925dd124a088f56ac90c5f290815e26337d4f61c1b