diff options
| author | Linus Torvalds | 2013-04-30 22:47:37 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2013-04-30 22:47:37 +0200 |
| commit | 30945669593df14692e933c557d00c4bb2727857 (patch) | |
| tree | 69dee0556b482898ae95f1bdfa25c63f4ce16f57 /arch/sparc/kernel/pci.c | |
| parent | Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff) | |
| parent | vsprintf: Add extension %pSR - print_symbol replacement (diff) | |
| download | kernel-qcow2-linux-30945669593df14692e933c557d00c4bb2727857.tar.gz kernel-qcow2-linux-30945669593df14692e933c557d00c4bb2727857.tar.xz kernel-qcow2-linux-30945669593df14692e933c557d00c4bb2727857.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
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://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
vsprintf: Add extension %pSR - print_symbol replacement
Diffstat (limited to 'arch/sparc/kernel/pci.c')
0 files changed, 0 insertions, 0 deletions