[kernel] r17430 - in dists/squeeze/linux-2.6/debian/patches: debian series

[Ben Hutchings]

Author: benh
Date: Tue May 17 03:32:18 2011
New Revision: 17430

Log:
slub: Reenable for m68k

Added:
   dists/squeeze/linux-2.6/debian/patches/debian/slub-Reenable-for-m68k.patch
Modified:
   dists/squeeze/linux-2.6/debian/patches/series/35

Added: dists/squeeze/linux-2.6/debian/patches/debian/slub-Reenable-for-m68k.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/debian/slub-Reenable-for-m68k.patch	Tue May 17 03:32:18 2011	(r17430)
@@ -0,0 +1,28 @@
+From 4fb027f4664b0571b41bd22a8921940b4b5bfb4b Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 7 May 2011 04:26:50 +0100
+Subject: [PATCH] slub: Reenable for m68k
+
+Following commit 4aac0b4815ba592052758f4b468f253d383dc9d6
+'m68k/mm: Set all online nodes in N_NORMAL_MEMORY', SLUB should
+actually work.
+---
+ init/Kconfig |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/init/Kconfig b/init/Kconfig
+index 47dd02f..f108e91 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1209,7 +1209,7 @@ config SLAB
+ 	  per cpu and per node queues.
+ 
+ config SLUB
+-	depends on BROKEN || NUMA || !DISCONTIGMEM
++	depends on BROKEN || NUMA || !DISCONTIGMEM || M68K
+ 	bool "SLUB (Unqueued Allocator)"
+ 	help
+ 	   SLUB is a slab allocator that minimizes cache line usage
+-- 
+1.7.4.4
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/35
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/35	Mon May 16 18:43:34 2011	(r17429)
+++ dists/squeeze/linux-2.6/debian/patches/series/35	Tue May 17 03:32:18 2011	(r17430)
@@ -250,3 +250,4 @@
 + debian/mmc-Avoid-ABI-change-from-suspend-fix-2.patch
 + features/x86/backlight-mbp_nvidia_bl-add-support-for-MacBookPro7-1.patch
 + debian/af_unix-Avoid-ABI-change-from-introduction-of-recursion-limit.patch
++ debian/slub-Reenable-for-m68k.patch