Skip to content

Commit 666902e

Browse files
geertupmladek
authored andcommitted
lib/vsprintf: Remove atomic-unsafe support for %pCr
"%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]>
1 parent d63c16f commit 666902e

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

Documentation/core-api/printk-formats.rst

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

420420
%pC pll1
421421
%pCn pll1
422-
%pCr 1560000000
423422

424423
For printing struct clk structures. %pC and %pCn print the name
425424
(Common Clock Framework) or address (legacy clock framework) of the
426-
structure; %pCr prints the current clock rate.
425+
structure.
427426

428427
Passed by reference.
429428

lib/vsprintf.c

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

14481448
switch (fmt[1]) {
1449-
case 'r':
1450-
return number(buf, end, clk_get_rate(clk), spec);
1451-
14521449
case 'n':
14531450
default:
14541451
#ifdef CONFIG_COMMON_CLK

0 commit comments

Comments
 (0)