Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git] / kernel / locking / lockdep.c
index 3c3902c40a0ead24baedd59979285e80d74b1829..233459c03b5aee85787038fdfbb1037e479f1539 100644 (file)
@@ -688,7 +688,7 @@ static void print_lock(struct held_lock *hlock)
                return;
        }
 
-       printk(KERN_CONT "%p", hlock->instance);
+       printk(KERN_CONT "%px", hlock->instance);
        print_lock_name(lock);
        printk(KERN_CONT ", at: %pS\n", (void *)hlock->acquire_ip);
 }