SOURCES: kernel-desktop-small_fixes.patch - 'this_cpu' in slab.c a...

[sparky]

Author: sparky                       Date: Fri Jun 30 22:28:17 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 'this_cpu' in slab.c already fixed in preempt-rt.patch

---- Files affected:
SOURCES:
   kernel-desktop-small_fixes.patch (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-small_fixes.patch
diff -u SOURCES/kernel-desktop-small_fixes.patch:1.9 SOURCES/kernel-desktop-small_fixes.patch:1.10
--- SOURCES/kernel-desktop-small_fixes.patch:1.9	Thu Jun 22 17:44:39 2006
+++ SOURCES/kernel-desktop-small_fixes.patch	Sat Jul  1 00:28:12 2006
@@ -35,25 +35,6 @@
  
  #include <asm/atomic.h>
  #include <asm/types.h>
---- linux-2.6.17/mm/slab.c~	2006-06-19 17:12:13.000000000 +0000
-+++ linux-2.6.17/mm/slab.c	2006-06-19 17:11:25.000000000 +0000
-@@ -3243,14 +3243,14 @@
- 				if (unlikely(alien->avail == alien->limit)) {
- 					STATS_INC_ACOVERFLOW(cachep);
- 					__drain_alien_cache(cachep,
--							    alien, nodeid);
-+							    alien, nodeid, this_cpu);
- 				}
- 				alien->entry[alien->avail++] = objp;
- 				spin_unlock(&alien->lock);
- 			} else {
- 				spin_lock(&(cachep->nodelists[nodeid])->
- 					  list_lock);
--				free_block(cachep, &objp, 1, nodeid);
-+				free_block(cachep, &objp, 1, nodeid, this_cpu);
- 				spin_unlock(&(cachep->nodelists[nodeid])->
- 					    list_lock);
- 			}
 --- linux-2.6.17/include/asm-ppc/io.h~	2006-06-18 01:49:35.000000000 +0000
 +++ linux-2.6.17/include/asm-ppc/io.h	2006-06-22 02:44:19.000000000 +0000
 @@ -445,6 +445,10 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-small_fixes.patch?r1=1.9&r2=1.10&f=u