Resolves: bz 433270

This commit is contained in:
Neil Horman 2008-03-18 10:37:27 +00:00
parent 567601b73d
commit 4d493eb0d6
2 changed files with 12 additions and 8 deletions

View File

@ -1,6 +1,6 @@
diff -up irqbalance-0.55/irqbalance-0.55/irqbalance.c.orig irqbalance-0.55/irqbalance-0.55/irqbalance.c diff -up irqbalance-0.55/irqbalance-0.55/irqbalance.c.orig irqbalance-0.55/irqbalance-0.55/irqbalance.c
--- irqbalance-0.55/irqbalance-0.55/irqbalance.c.orig 2007-11-01 11:43:24.000000000 -0400 --- irqbalance-0.55/irqbalance-0.55/irqbalance.c.orig 2006-11-23 14:53:22.000000000 -0500
+++ irqbalance-0.55/irqbalance-0.55/irqbalance.c 2007-11-01 15:00:53.000000000 -0400 +++ irqbalance-0.55/irqbalance-0.55/irqbalance.c 2008-03-18 06:33:03.000000000 -0400
@@ -22,7 +22,11 @@ @@ -22,7 +22,11 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -23,17 +23,18 @@ diff -up irqbalance-0.55/irqbalance-0.55/irqbalance.c.orig irqbalance-0.55/irqba
if (argc>1 && strstr(argv[1],"debug")) if (argc>1 && strstr(argv[1],"debug"))
debug_mode=1; debug_mode=1;
if (argc>1 && strstr(argv[1],"oneshot")) if (argc>1 && strstr(argv[1],"oneshot"))
@@ -67,9 +74,6 @@ int main(int argc, char** argv) @@ -67,9 +74,9 @@ int main(int argc, char** argv)
if (getenv("IRQBALANCE_DEBUG")) if (getenv("IRQBALANCE_DEBUG"))
debug_mode=1; debug_mode=1;
- parse_cpu_tree(); + /* Initial parse to get correct core count */
- parse_cpu_tree();
- -
/* On single core UP systems irqbalance obviously has no work to do */ /* On single core UP systems irqbalance obviously has no work to do */
if (core_count<2) if (core_count<2)
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
@@ -82,6 +86,19 @@ int main(int argc, char** argv) @@ -82,6 +89,19 @@ int main(int argc, char** argv)
if (daemon(0,0)) if (daemon(0,0))
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -53,7 +54,7 @@ diff -up irqbalance-0.55/irqbalance-0.55/irqbalance.c.orig irqbalance-0.55/irqba
parse_proc_interrupts(); parse_proc_interrupts();
sleep(SLEEP_INTERVAL/4); sleep(SLEEP_INTERVAL/4);
reset_counts(); reset_counts();
@@ -134,5 +151,8 @@ int main(int argc, char** argv) @@ -134,5 +154,8 @@ int main(int argc, char** argv)
break; break;
counter++; counter++;
} }

View File

@ -1,7 +1,7 @@
Summary: IRQ balancing daemon. Summary: IRQ balancing daemon.
Name: irqbalance Name: irqbalance
Version: 0.55 Version: 0.55
Release: 8%{?dist} Release: 9%{?dist}
Epoch: 2 Epoch: 2
Group: System Environment/Base Group: System Environment/Base
License: GPL/OSL License: GPL/OSL
@ -78,6 +78,9 @@ exit 0
%changelog %changelog
* Tue Mar 18 2008 Neil Horman <nhorman@redhat.com> - 2:0.55-9
- Rediff pid-file patch to not remove initial parse_cpu_tree (bz 433270)
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2:0.55-8 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2:0.55-8
- Autorebuild for GCC 4.3 - Autorebuild for GCC 4.3