Re: 2.6.15-rt17

[Ingo Molnar <mingo@elte.hu>]

* Bill Huey <billh@gnuppy.monkey.org> wrote:

> On Tue, Feb 21, 2006 at 04:55:48PM +0100, Ingo Molnar wrote:
> > another change is the reworking of the SLAB code: it now closely matches 
> > the upstream SLAB code, and it should now work on NUMA systems too 
> > (untested though).
> 
> SLAB you say ? What's going on with this error ?
> 
> ----
> mm/built-in.o: In function `drain_alien_cache':slab.c:(.text+0x1fb2c):
> undefined reference to `slab_spin_unlock_irqrestore'
> make: *** [.tmp_vmlinux1] Error 1
> ----

find the fix from S�bastien Dugu� below.

	Ingo

Index: linux-2.6.15-rt17-numa/mm/slab.c
===================================================================
--- linux-2.6.15-rt17-numa.orig/mm/slab.c	2006-02-22 10:38:26.000000000 +0100
+++ linux-2.6.15-rt17-numa/mm/slab.c	2006-02-22 11:12:42.000000000 +0100
@@ -163,8 +163,8 @@
 				 	spin_unlock_irq(lock)
 # define slab_spin_lock_irqsave(lock, flags, cpu) \
  	do { spin_lock_irqsave(lock, flags); (cpu) = smp_processor_id(); } while (0)
-# define slab_spin_lock_irqrestore(lock, flags, cpu) \
- 	do { spin_lock_irqrestore(lock, flags); } while (0)
+# define slab_spin_unlock_irqrestore(lock, flags, cpu) \
+ 	do { spin_unlock_irqrestore(lock, flags); } while (0)
 #else
 DEFINE_PER_CPU_LOCKED(int, slab_locks) = { 0, };
 # define slab_irq_disable(cpu)		get_cpu_var_locked(slab_locks, &(cpu))
@@ -183,8 +183,8 @@
 		do { spin_unlock(lock); slab_irq_enable(cpu); } while (0)
 # define slab_spin_lock_irqsave(lock, flags, cpu) \
  	do { slab_irq_disable(cpu); spin_lock_irqsave(lock, flags); } while (0)
-# define slab_spin_lock_irqrestore(lock, flags, cpu) \
- 	do { spin_lock_irqrestore(lock, flags); slab_irq_enable(cpu); } while (0)
+# define slab_spin_unlock_irqrestore(lock, flags, cpu) \
+ 	do { spin_unlock_irqrestore(lock, flags); slab_irq_enable(cpu); } while (0)
 #endif
 
 /* Shouldn't this be in a header file somewhere? */