rpms/kernel/F-7 kernel-2.6.spec, 1.3212, 1.3213 linux-2.6-prevent-idle-softirq.patch, 1.1, 1.2

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25423

Modified Files:
	kernel-2.6.spec linux-2.6-prevent-idle-softirq.patch 
Log Message:
* Mon Jun 04 2007 Dave Jones <davej at redhat.com>
- Switch 'Prevent going idle with softirq pending' patch to upstream variant.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3212
retrieving revision 1.3213
diff -u -r1.3212 -r1.3213
--- kernel-2.6.spec	2 Jun 2007 00:26:44 -0000	1.3212
+++ kernel-2.6.spec	4 Jun 2007 16:19:52 -0000	1.3213
@@ -2426,6 +2426,9 @@
 %endif
 
 %changelog
+* Mon Jun 04 2007 Dave Jones <davej at redhat.com>
+- Switch 'Prevent going idle with softirq pending' patch to upstream variant.
+
 * Fri Jun 01 2007 Dave Jones <davej at redhat.com>
 - E1000: Fix netif_poll_enable crash in e1000_open.
 

linux-2.6-prevent-idle-softirq.patch:

Index: linux-2.6-prevent-idle-softirq.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-prevent-idle-softirq.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-prevent-idle-softirq.patch	22 May 2007 04:08:25 -0000	1.1
+++ linux-2.6-prevent-idle-softirq.patch	4 Jun 2007 16:19:52 -0000	1.2
@@ -78,13 +78,13 @@
 
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
-@@ -4776,7 +4776,7 @@ int __sched cond_resched_softirq(void)
+@@ -4776,9 +4776,7 @@ int __sched cond_resched_softirq(void)
  
  	if (need_resched() && system_state == SYSTEM_RUNNING) {
- 		raw_local_irq_disable();
+-		raw_local_irq_disable();
 -		_local_bh_enable();
+-		raw_local_irq_enable();
 +		local_bh_enable();
- 		raw_local_irq_enable();
  		__cond_resched();
  		local_bh_disable();