Merge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6

1 files changed, 4 insertions, 0 deletions

diff --git a/arch/i386/mm/pageattr.c b/arch/i386/mm/pageattr.c
index c30a16df6440..e8a53552b13d 100644
--- a/arch/i386/mm/pageattr.c
+++ b/arch/i386/mm/pageattr.c
@@ -222,6 +222,10 @@ 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),
+                                                 page_address(page+numpages));
+
         /* the return value is ignored - the calls cannot fail,
          * large pages are disabled at boot time.
          */