Skip to content

Commit ea0ac01

Browse files
geertugregkh
authored andcommitted
lib/vsprintf: Remove atomic-unsafe support for %pCr
commit 666902e upstream. "%pCr" formats the current rate of a clock, and calls clk_get_rate(). The latter obtains a mutex, hence it must not be called from atomic context. Remove support for this rarely-used format, as vsprintf() (and e.g. printk()) must be callable from any context. Any remaining out-of-tree users will start seeing the clock's name printed instead of its rate. Reported-by: Jia-Ju Bai <[email protected]> Fixes: 900cca2 ("lib/vsprintf: add %pC{,n,r} format specifiers for clocks") Link: http://lkml.kernel.org/r/[email protected] To: Jia-Ju Bai <[email protected]> To: Jonathan Corbet <[email protected]> To: Michael Turquette <[email protected]> To: Stephen Boyd <[email protected]> To: Zhang Rui <[email protected]> To: Eduardo Valentin <[email protected]> To: Eric Anholt <[email protected]> To: Stefan Wahren <[email protected]> To: Greg Kroah-Hartman <[email protected]> Cc: Sergey Senozhatsky <[email protected]> Cc: Petr Mladek <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Steven Rostedt <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: Geert Uytterhoeven <[email protected]> Cc: [email protected] # 4.1+ Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Petr Mladek <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 9fcc267 commit ea0ac01

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

Documentation/printk-formats.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,11 +397,10 @@ struct clk
397397

398398
%pC pll1
399399
%pCn pll1
400-
%pCr 1560000000
401400

402401
For printing struct clk structures. ``%pC`` and ``%pCn`` print the name
403402
(Common Clock Framework) or address (legacy clock framework) of the
404-
structure; ``%pCr`` prints the current clock rate.
403+
structure.
405404

406405
Passed by reference.
407406

lib/vsprintf.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,9 +1392,6 @@ char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec,
13921392
return string(buf, end, NULL, spec);
13931393

13941394
switch (fmt[1]) {
1395-
case 'r':
1396-
return number(buf, end, clk_get_rate(clk), spec);
1397-
13981395
case 'n':
13991396
default:
14001397
#ifdef CONFIG_COMMON_CLK

0 commit comments

Comments
 (0)