From 976903f3f1243fd4f6f5119a96b2f5afdc6d05b6 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 27 Jun 2006 02:54:49 -0700
Subject: [PATCH] --- yaml --- r: 30806 b: refs/heads/master c:
 f9b8404cf8f8456dfa83459510762b700dc00385 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/arch/i386/mm/pageattr.c |  4 ++--
 trunk/include/linux/mm.h      | 10 ++++++++--
 trunk/mm/page_alloc.c         |  4 ++--
 trunk/mm/slab.c               |  2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 8b4e22f4654e..ad69994a6792 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6abdce7680e3e8436b3292b345d77b67d5ec9ea8
+refs/heads/master: f9b8404cf8f8456dfa83459510762b700dc00385
diff --git a/trunk/arch/i386/mm/pageattr.c b/trunk/arch/i386/mm/pageattr.c
index 0887b34bc59b..353a836ed63c 100644
--- a/trunk/arch/i386/mm/pageattr.c
+++ b/trunk/arch/i386/mm/pageattr.c
@@ -229,8 +229,8 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
 	if (PageHighMem(page))
 		return;
 	if (!enable)
-		mutex_debug_check_no_locks_freed(page_address(page),
-						 numpages * PAGE_SIZE);
+		debug_check_no_locks_freed(page_address(page),
+					   numpages * PAGE_SIZE);
 
 	/* the return value is ignored - the calls cannot fail,
 	 * large pages are disabled at boot time.
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
index ff1fa87df8d0..0ac255720f34 100644
--- a/trunk/include/linux/mm.h
+++ b/trunk/include/linux/mm.h
@@ -1030,13 +1030,19 @@ static inline void vm_stat_account(struct mm_struct *mm,
 }
 #endif /* CONFIG_PROC_FS */
 
+static inline void
+debug_check_no_locks_freed(const void *from, unsigned long len)
+{
+	mutex_debug_check_no_locks_freed(from, len);
+}
+
 #ifndef CONFIG_DEBUG_PAGEALLOC
 static inline void
 kernel_map_pages(struct page *page, int numpages, int enable)
 {
 	if (!PageHighMem(page) && !enable)
-		mutex_debug_check_no_locks_freed(page_address(page),
-						 numpages * PAGE_SIZE);
+		debug_check_no_locks_freed(page_address(page),
+					   numpages * PAGE_SIZE);
 }
 #endif
 
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index dafd12ec7a0c..084a2de7e52a 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -446,8 +446,8 @@ static void __free_pages_ok(struct page *page, unsigned int order)
 
 	arch_free_page(page, order);
 	if (!PageHighMem(page))
-		mutex_debug_check_no_locks_freed(page_address(page),
-						 PAGE_SIZE<<order);
+		debug_check_no_locks_freed(page_address(page),
+					   PAGE_SIZE<<order);
 
 	for (i = 0 ; i < (1 << order) ; ++i)
 		reserved += free_pages_check(page + i);
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index d1d55279202e..f378d027c684 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -3397,7 +3397,7 @@ void kfree(const void *objp)
 	local_irq_save(flags);
 	kfree_debugcheck(objp);
 	c = virt_to_cache(objp);
-	mutex_debug_check_no_locks_freed(objp, obj_size(c));
+	debug_check_no_locks_freed(objp, obj_size(c));
 	__cache_free(c, (void *)objp);
 	local_irq_restore(flags);
 }