From bc7b6d43ceb82ec74cd9204c986415782767ce4b Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Date: Mon, 14 Dec 2009 17:59:02 -0800
Subject: [PATCH] --- yaml --- r: 176274 b: refs/heads/master c:
 a70caa8ba48f21f46d3b4e71b6b8d14080bbd57a h: refs/heads/master v: v3

---
 [refs]           | 2 +-
 trunk/mm/Kconfig | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c3478e3dc029..fcb86af50cbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cb1729b1385884648170d9d1d3aa0c66780d64b
+refs/heads/master: a70caa8ba48f21f46d3b4e71b6b8d14080bbd57a
diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig
index 77b4980d6143..d4b5fff6ea09 100644
--- a/trunk/mm/Kconfig
+++ b/trunk/mm/Kconfig
@@ -158,11 +158,13 @@ config PAGEFLAGS_EXTENDED
 # Default to 4 for wider testing, though 8 might be more appropriate.
 # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
 # PA-RISC 7xxx's spinlock_t would enlarge struct page from 32 to 44 bytes.
+# DEBUG_SPINLOCK and DEBUG_LOCK_ALLOC spinlock_t also enlarge struct page.
 #
 config SPLIT_PTLOCK_CPUS
 	int
-	default "4096" if ARM && !CPU_CACHE_VIPT
-	default "4096" if PARISC && !PA20
+	default "999999" if ARM && !CPU_CACHE_VIPT
+	default "999999" if PARISC && !PA20
+	default "999999" if DEBUG_SPINLOCK || DEBUG_LOCK_ALLOC
 	default "4"
 
 #