diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-25 20:52:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-25 20:52:22 -0400 |
| commit | 94df491c4a01b39d81279a68386158eb02656712 (patch) | |
| tree | ba431d9d74f11a7117883df54908ea39e4ef7c5c /arch/x86 | |
| parent | 26ff6801f751cd47e44c2e9507ec08b447f2d2b9 (diff) | |
| parent | 29096202176ceaa5016a17ea2dd1aea19a4e90e2 (diff) | |
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/x86')
| -rw-r--r-- | arch/x86/kernel/dumpstack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index 81ac6c78c01c..e2a3f0606da4 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c | |||
| @@ -27,7 +27,7 @@ static int die_counter; | |||
| 27 | 27 | ||
| 28 | void printk_address(unsigned long address, int reliable) | 28 | void printk_address(unsigned long address, int reliable) |
| 29 | { | 29 | { |
| 30 | printk(" [<%p>] %s%pS\n", (void *) address, | 30 | printk(" [<%p>] %s%pB\n", (void *) address, |
| 31 | reliable ? "" : "? ", (void *) address); | 31 | reliable ? "" : "? ", (void *) address); |
| 32 | } | 32 | } |
| 33 | 33 | ||