SOURCES: kernel-desktop-preempt-rt.patch - -rt7

[sparky]

Author: sparky                       Date: Thu Jul  6 02:37:05 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- -rt7

---- Files affected:
SOURCES:
   kernel-desktop-preempt-rt.patch (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-preempt-rt.patch
diff -u SOURCES/kernel-desktop-preempt-rt.patch:1.14 SOURCES/kernel-desktop-preempt-rt.patch:1.15
--- SOURCES/kernel-desktop-preempt-rt.patch:1.14	Fri Jun 30 23:22:04 2006
+++ SOURCES/kernel-desktop-preempt-rt.patch	Thu Jul  6 04:36:59 2006
@@ -39972,7 +39972,7 @@
  	if (!handler)
  		return -EINVAL;
  
-@@ -390,6 +473,270 @@ int request_irq(unsigned int irq,
+@@ -390,6 +473,268 @@ int request_irq(unsigned int irq,
  
  	return retval;
  }
@@ -40149,17 +40149,21 @@
 +
 +static int curr_irq_prio = 49;
 +
++static void follow_irq_affinity(struct irq_desc *desc)
++{
++#ifdef CONFIG_SMP
++	if (cpus_equal(current->cpus_allowed, desc->affinity))
++		return;
++	set_cpus_allowed(current, desc->affinity);
++#endif
++}
++
 +static int do_irqd(void * __desc)
 +{
 +	struct sched_param param = { 0, };
 +	struct irq_desc *desc = __desc;
-+#ifdef CONFIG_SMP
-+	int irq = desc - irq_desc;
-+	cpumask_t mask;
 +
-+	mask = cpumask_of_cpu(any_online_cpu(irq_desc[irq].affinity));
-+	set_cpus_allowed(current, mask);
-+#endif
++	follow_irq_affinity(desc);
 +	current->flags |= PF_NOFREEZE | PF_HARDIRQ;
 +
 +	/*
@@ -40178,13 +40182,7 @@
 +		local_irq_disable();
 +		__do_softirq();
 +		local_irq_enable();
-+#ifdef CONFIG_SMP
-+		/*
-+		 * Did IRQ affinities change?
-+		 */
-+		if (!cpus_equal(current->cpus_allowed, irq_desc[irq].affinity))
-+			set_cpus_allowed(current, irq_desc[irq].affinity);
-+#endif
++		follow_irq_affinity(desc);
 +		schedule();
 +	}
 +	__set_current_state(TASK_RUNNING);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-preempt-rt.patch?r1=1.14&r2=1.15&f=u