path: root/Documentation/printk-formats.txt
diff options
authorLinus Torvalds <>2013-04-30 13:47:37 -0700
committerLinus Torvalds <>2013-04-30 13:47:37 -0700
commit30945669593df14692e933c557d00c4bb2727857 (patch)
tree69dee0556b482898ae95f1bdfa25c63f4ce16f57 /Documentation/printk-formats.txt
parent5aa1c98862d3f365d9cf6d0833d5dc127d2a76e7 (diff)
parentb0d33c2bd77bcf2d7c9427d2361ac57fe5b33aa1 (diff)
Merge branch 'for-linus' of git://
Pull fixup for trivial branch from Jiri Kosina: "Unfortunately I made a mistake when merging into for-linus branch, and omitted one pre-requisity patch for a few other patches (which have been Acked by the appropriate maintainers) in the series. Mea culpa maxima, sorry for that." The trivial branch added %pSR usage before actually teaching vsnprintf() about the 'R' part of %pSR. The 'R' causes the symbol translation to do a "__builtin_extract_return_addr()" before symbol lookup. That said, on most architectures __builtin_extract_return_addr() isn't likely to do anything special, so it probably is not normally noticeable. * 'for-linus' of git:// vsprintf: Add extension %pSR - print_symbol replacement
Diffstat (limited to 'Documentation/printk-formats.txt')
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/printk-formats.txt b/Documentation/printk-formats.txt
index 6e953564de03..3af5ae6c9c11 100644
--- a/Documentation/printk-formats.txt
+++ b/Documentation/printk-formats.txt
@@ -17,6 +17,8 @@ Symbols/Function Pointers:
%pF versatile_init+0x0/0x110
%pf versatile_init
%pS versatile_init+0x0/0x110
+ %pSR versatile_init+0x9/0x110
+ (with __builtin_extract_return_addr() translation)
%ps versatile_init
%pB prev_fn_of_versatile_init+0x88/0x88