From 4d493eb0d6740011cc04298edf67a21e1871d1a4 Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@fedoraproject.org>
Date: Tue, 18 Mar 2008 10:37:27 +0000
Subject: [PATCH] Resolves: bz 433270

---
 irqbalance-0.55-pid-file.patch | 15 ++++++++-------
 irqbalance.spec                |  5 ++++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/irqbalance-0.55-pid-file.patch b/irqbalance-0.55-pid-file.patch
index 9e38b5d..80d80de 100644
--- a/irqbalance-0.55-pid-file.patch
+++ b/irqbalance-0.55-pid-file.patch
@@ -1,6 +1,6 @@
 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	2007-11-01 15:00:53.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	2008-03-18 06:33:03.000000000 -0400
 @@ -22,7 +22,11 @@
  #include <stdio.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"))
  		debug_mode=1;
  	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")) 
  		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 */
  	if (core_count<2) 
  		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))
  			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();
  	sleep(SLEEP_INTERVAL/4);
  	reset_counts();
-@@ -134,5 +151,8 @@ int main(int argc, char** argv)
+@@ -134,5 +154,8 @@ int main(int argc, char** argv)
  			break;
  		counter++;
  	}
diff --git a/irqbalance.spec b/irqbalance.spec
index e3efaf0..a99d3c5 100644
--- a/irqbalance.spec
+++ b/irqbalance.spec
@@ -1,7 +1,7 @@
 Summary:        IRQ balancing daemon.
 Name:           irqbalance
 Version:        0.55 
-Release: 	8%{?dist}
+Release: 	9%{?dist}
 Epoch:		2	
 Group:          System Environment/Base
 License:        GPL/OSL
@@ -78,6 +78,9 @@ exit 0
 
 
 %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
 - Autorebuild for GCC 4.3