Re: [patch] Real-Time Preemption, -RT-2.6.13-rc4-V0.7.52-01

[Peter Zijlstra <a.p.zijlstra@chello.nl>]

Hi Ingo,

-02 needs the attached patch to compile with my config.

Regards,

Peter Zijlstra

--- linux-2.6.13-rc4-RT-V0.7.52-02/mm/swap.c.orig	2005-07-30 21:38:28.000000000 +0200
+++ linux-2.6.13-rc4-RT-V0.7.52-02/mm/swap.c	2005-07-30 21:40:11.000000000 +0200
@@ -422,14 +422,17 @@
 #ifdef CONFIG_HOTPLUG_CPU
 static void lru_drain_cache(unsigned int cpu)
 {
-	struct pagevec *pvec = &per_cpu(lru_add_pvecs, cpu);
+	struct pagevec *pvec = &get_cpu_var_locked(lru_add_pvecs, cpu);
 
 	/* CPU is dead, so no locking needed. */
 	if (pagevec_count(pvec))
 		__pagevec_lru_add(pvec);
-	pvec = &per_cpu(lru_add_active_pvecs, cpu);
+	put_cpu_var_locked(lru_add_pvecs, cpu);
+
+	pvec = &get_cpu_var_locked(lru_add_active_pvecs, cpu);
 	if (pagevec_count(pvec))
 		__pagevec_lru_add_active(pvec);
+	put_cpu_var_locked(lru_add_active_pvecs, cpu);
 }
 
 /* Drop the CPU's cached committed space back into the central pool. */
--- linux-2.6.13-rc4-RT-V0.7.52-02/drivers/message/i2o/exec-osm.c~	2005-07-30 20:46:19.000000000 +0200
+++ linux-2.6.13-rc4-RT-V0.7.52-02/drivers/message/i2o/exec-osm.c	2005-07-30 21:58:38.000000000 +0200
@@ -204,7 +204,7 @@
 {
 	struct i2o_exec_wait *wait, *tmp;
 	unsigned long flags;
-	static spinlock_t lock = SPIN_LOCK_UNLOCKED;
+	static DEFINE_SPINLOCK(lock);
 	int rc = 1;
 
 	/*