aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-25 17:52:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-25 17:52:22 -0700
commit94df491c4a01b39d81279a68386158eb02656712 (patch)
treeba431d9d74f11a7117883df54908ea39e4ef7c5c /arch
parent26ff6801f751cd47e44c2e9507ec08b447f2d2b9 (diff)
parent29096202176ceaa5016a17ea2dd1aea19a4e90e2 (diff)
downloadkernel_samsung_espresso10-94df491c4a01b39d81279a68386158eb02656712.zip
kernel_samsung_espresso10-94df491c4a01b39d81279a68386158eb02656712.tar.gz
kernel_samsung_espresso10-94df491c4a01b39d81279a68386158eb02656712.tar.bz2
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: futex: Fix WARN_ON() test for UP WARN_ON_SMP(): Allow use in if() statements on UP x86, dumpstack: Use %pB format specifier for stack trace vsprintf: Introduce %pB format specifier lockdep: Remove unused 'factor' variable from lockdep_stats_show()
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/dumpstack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index 81ac6c7..e2a3f06 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -27,7 +27,7 @@ static int die_counter;
void printk_address(unsigned long address, int reliable)
{
- printk(" [<%p>] %s%pS\n", (void *) address,
+ printk(" [<%p>] %s%pB\n", (void *) address,
reliable ? "" : "? ", (void *) address);
}