Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vsprintf: add %ps that is the same as %pS but is like %pf

Browse source 
On PowerPC64 function pointers do not point directly at the functions,
but instead point to pointers to the functions. The output of %pF expects
to point to a pointer to the function, whereas %pS will show the function
itself.

mcount returns the direct pointer to the function and not the pointer to
the pointer. Thus %pS must be used to show this. The function tracer
requires printing of the functions without offsets and uses the %pf
instead.

 %pF produces run_local_timers+0x4/0x1f
 %pf produces just run_local_timers

For PowerPC64, we need to use the direct pointer, and we only have
%pS which will produce .run_local_timers+0x4/0x1f

This patch creates a %ps that matches the %pf as %pS matches %pF.

Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Zhao Lei <zhaolei@cn.fujitsu.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt 2009-09-16 20:03:06 -04:00 committed by Steven Rostedt
parent 45bd00d31d
commit 91adcd2c4b
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/vsprintf.c
View file

@ -581,7 +581,7 @@ static char *symbol_string(char *buf, char *end, void *ptr,
unsigned long value = (unsigned long) ptr; unsigned long value = (unsigned long) ptr;
#ifdef CONFIG_KALLSYMS #ifdef CONFIG_KALLSYMS
char sym[KSYM_SYMBOL_LEN]; char sym[KSYM_SYMBOL_LEN];
if (ext != 'f') if (ext != 'f' && ext != 's')
sprint_symbol(sym, value); sprint_symbol(sym, value);
else else
kallsyms_lookup(value, NULL, NULL, NULL, sym); kallsyms_lookup(value, NULL, NULL, NULL, sym);
@ -822,6 +822,7 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,
case 'F': case 'F':
case 'f': case 'f':
ptr = dereference_function_descriptor(ptr); ptr = dereference_function_descriptor(ptr);
case 's':
/* Fallthrough */ /* Fallthrough */
case 'S': case 'S':
return symbol_string(buf, end, ptr, spec, *fmt); return symbol_string(buf, end, ptr, spec, *fmt);
@ -1063,7 +1064,8 @@ static int format_decode(const char *fmt, struct printf_spec *spec)
* @args: Arguments for the format string * @args: Arguments for the format string
* *
* This function follows C99 vsnprintf, but has some extensions: * This function follows C99 vsnprintf, but has some extensions:
* %pS output the name of a text symbol * %pS output the name of a text symbol with offset
* %ps output the name of a text symbol without offset
* %pF output the name of a function pointer with its offset * %pF output the name of a function pointer with its offset
* %pf output the name of a function pointer without its offset * %pf output the name of a function pointer without its offset
* %pR output the address range in a struct resource * %pR output the address range in a struct resource