Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git

3 files changed, 3 insertions, 3 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index a5e6891f7bb6..8e363536e2da 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -417,7 +417,7 @@ 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_address(page+(1<<order)));
+                                                 PAGE_SIZE<<order);
 
 #ifndef CONFIG_MMU
         for (i = 1 ; i < (1 << order) ; ++i)
diff --git a/mm/slab.c b/mm/slab.c
index 33aab345cd4a..9374293a3012 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3071,7 +3071,7 @@ void kfree(const void *objp)
         local_irq_save(flags);
         kfree_debugcheck(objp);
         c = page_get_cache(virt_to_page(objp));
-        mutex_debug_check_no_locks_freed(objp, objp+obj_reallen(c));
+        mutex_debug_check_no_locks_freed(objp, obj_reallen(c));
         __cache_free(c, (void *)objp);
         local_irq_restore(flags);
 }
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 6544565a7c0f..d8a5afc8b2a3 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1442,7 +1442,7 @@ asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags)
         else if (!memcmp("SWAPSPACE2",swap_header->magic.magic,10))
                 swap_header_version = 2;
         else {
-                printk("Unable to find swap-space signature\n");
+                printk(KERN_ERR "Unable to find swap-space signature\n");
                 error = -EINVAL;
                 goto bad_swap;
         }