Accepting request 291211 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/291211
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/irqbalance?expand=0&rev=40
This commit is contained in:
Dominique Leuenberger 2015-03-19 19:55:44 +00:00 committed by Git OBS Bridge
commit 647cf124b3
5 changed files with 22 additions and 57 deletions

View File

@ -1,44 +0,0 @@
From: Takashi Iwai <tiwai@suse.com>
Only warn once for affinity hint subset empty irqs
bnc#893478
Signed-off-by: Thomas Renninger <trenn@suse.de>
---
activate.c | 13 ++++++++-----
types.h | 1 +
2 files changed, 9 insertions(+), 5 deletions(-)
--- a/activate.c
+++ b/activate.c
@@ -84,11 +84,14 @@ static void activate_mapping(struct irq_info *info, void *data __attribute__((un
if ((info->hint_policy == HINT_POLICY_SUBSET) &&
(!cpus_empty(info->affinity_hint))) {
cpus_and(applied_mask, applied_mask, info->affinity_hint);
- if (!cpus_intersects(applied_mask, unbanned_cpus))
- log(TO_ALL, LOG_WARNING,
- "irq %d affinity_hint subset empty\n",
- info->irq);
- else
+ if (!cpus_intersects(applied_mask, unbanned_cpus)) {
+ if (!info->warned) {
+ info->warned = 1;
+ log(TO_ALL, LOG_WARNING,
+ "irq %d affinity_hint subset empty\n",
+ info->irq);
+ }
+ } else
valid_mask = 1;
} else {
valid_mask = 1;
--- a/types.h
+++ b/types.h
@@ -69,6 +69,7 @@ struct irq_info {
uint64_t load;
int moved;
struct topo_obj *assigned_obj;
+ unsigned int warned;
};
#endif

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Mar 16 20:21:29 UTC 2015 - mpluskal@suse.com
- Clenup spec file with spec-cleaner
- Remove bug-893478_warn-once.patch
- Update to 1.0.9
* PCI quirk support
* System Logging compatibility
* isolcpus inheritance
* Misc. Bugfixes
-------------------------------------------------------------------
Fri Jan 23 10:36:21 UTC 2015 - p.drouand@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package irqbalance
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: irqbalance
Version: 1.0.8
Version: 1.0.9
Release: 0
Summary: Balance IRQs on SMP Machines
License: GPL-2.0+
@ -25,15 +25,14 @@ Group: System/Daemons
Url: https://github.com/Irqbalance/irqbalance
Source: https://github.com/Irqbalance/irqbalance/archive/v%{version}.tar.gz
Source3: sysconfig.irqbalance
Patch0: bug-893478_warn-once.patch
BuildRequires: libcap-ng-devel
BuildRequires: libnuma-devel
BuildRequires: libtool
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(glib-2.0)
Requires(pre): coreutils
Requires(pre): fillup
ExclusiveArch: ia64 x86_64 ppc64 ppc64le ppc %sparc
BuildRequires: libcap-ng-devel
BuildRequires: systemd
ExclusiveArch: ia64 x86_64 ppc64 ppc64le ppc %{sparc}
%{?systemd_requires}
%description
@ -42,12 +41,11 @@ being used for all IRQs.
%prep
%setup -q
%patch0 -p1
%build
NOCONFIGURE=1 ./autogen.sh
%configure
make LDFLAGS="-Wl,-z,relro,-z,now" CFLAGS="%{optflags} -fPIE -pie"
make %{?_smp_mflags} LDFLAGS="-Wl,-z,relro,-z,now" CFLAGS="%{optflags} -fPIE -pie"
cp %{SOURCE3} .
gzip irqbalance.1
@ -58,11 +56,11 @@ mkdir -p %{buildroot}%{_mandir}/man1
install -m 0644 irqbalance.1.gz %{buildroot}%{_mandir}/man1
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates/
install -m 0644 sysconfig.irqbalance %{buildroot}%{_localstatedir}/adm/fillup-templates/
sed -ie "s|EnvironmentFile=.*|EnvironmentFile=/etc/sysconfig/irqbalance|g" misc/irqbalance.service
sed -ie "s|EnvironmentFile=.*|EnvironmentFile=%{_sysconfdir}/sysconfig/irqbalance|g" misc/irqbalance.service
# Remove syslog.target in systemd service file; not provided by systemd anymore
sed -ie "s|After=syslog.target||g" misc/irqbalance.service
install -D -m 0644 misc/irqbalance.service %{buildroot}%{_unitdir}/irqbalance.service
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcirqbalance
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcirqbalance
%pre
%service_add_pre irqbalance.service

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9329941b9d6b9edcba045534dbe33a1b681fa8339c94e08d9fd8aad52a7e0d65
size 41946

3
v1.0.9.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f1b8115948bb9f0bc36b9d7143ee8be751a294bc189d311408e753acc37169c3
size 44661