[kernel] r17311 - in dists/sid/linux-2.6/debian: . patches/debian patches/series

[Ben Hutchings]

Author: benh
Date: Sat May  7 03:31:19 2011
New Revision: 17311

Log:
slub: Reenable for m68k

Added:
   dists/sid/linux-2.6/debian/patches/debian/slub-Reenable-for-m68k.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/5

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat May  7 03:21:05 2011	(r17310)
+++ dists/sid/linux-2.6/debian/changelog	Sat May  7 03:31:19 2011	(r17311)
@@ -32,7 +32,7 @@
     - ath9k_hw: Partially revert "fix dma descriptor rx error bit parsing"
     - [s390] pfault: fix token handling
     - ACPI/PM: Avoid infinite recurrence while registering power resources
-    - [hppa, m68k] slub: Disable use with DISCONTIGMEM && !NUMA
+    - [hppa] slub: Disable use with DISCONTIGMEM && !NUMA
     - vfs: avoid large kmalloc()s for the fdtable
     - agp: Fix arbitrary kernel memory writes (CVE-2011-1745)
     - agp: Fix OOM and buffer overflow (CVE-2011-1746)

Added: dists/sid/linux-2.6/debian/patches/debian/slub-Reenable-for-m68k.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/debian/slub-Reenable-for-m68k.patch	Sat May  7 03:31:19 2011	(r17311)
@@ -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/sid/linux-2.6/debian/patches/series/5
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/5	Sat May  7 03:21:05 2011	(r17310)
+++ dists/sid/linux-2.6/debian/patches/series/5	Sat May  7 03:31:19 2011	(r17311)
@@ -11,6 +11,7 @@
 - bugfix/s390/S390-pfault-fix-token-handling.patch
 - bugfix/all/kconfig-Avoid-buffer-underrun-in-choice-input.patch
 + bugfix/all/stable/2.6.38.5.patch
++ debian/slub-Reenable-for-m68k.patch
 + bugfix/all/mpt2sas-prevent-heap-overflows-and-unchecked-reads.patch
 + bugfix/arm/arm-6891-1-prevent-heap-corruption-in-oabi-semtimedop.patch
 + bugfix/all/can-add-missing-socket-check-in-can-bcm-release.patch