4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <geert+rene...@glider.be>
commit 666902e42fd8344b923c02dc5b0f37948ff4f225 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 <baijiaju1...@gmail.com>
Fixes: 900cca2944254edd ("lib/vsprintf: add %pC{,n,r} format specifiers for
clocks")
Link:
http://lkml.kernel.org/r/1527845302-12159-5-git-send-email-geert+rene...@glider.be
To: Jia-Ju Bai <baijiaju1...@gmail.com>
To: Jonathan Corbet <cor...@lwn.net>
To: Michael Turquette <mturque...@baylibre.com>
To: Stephen Boyd <sb...@kernel.org>
To: Zhang Rui <rui.zh...@intel.com>
To: Eduardo Valentin <edubez...@gmail.com>
To: Eric Anholt <e...@anholt.net>
To: Stefan Wahren <stefan.wah...@i2se.com>
To: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky.w...@gmail.com>
Cc: Petr Mladek <pmla...@suse.com>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Steven Rostedt <rost...@goodmis.org>
Cc: linux-...@vger.kernel.org
Cc: linux-...@vger.kernel.org
Cc: linux...@vger.kernel.org
Cc: linux-ser...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-renesas-...@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: Geert Uytterhoeven <geert+rene...@glider.be>
Cc: sta...@vger.kernel.org # 4.1+
Signed-off-by: Geert Uytterhoeven <geert+rene...@glider.be>
Signed-off-by: Petr Mladek <pmla...@suse.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
Documentation/printk-formats.txt | 3 +--
lib/vsprintf.c | 3 ---
2 files changed, 1 insertion(+), 5 deletions(-)
--- a/Documentation/printk-formats.txt
+++ b/Documentation/printk-formats.txt
@@ -273,11 +273,10 @@ struct clk:
%pC pll1
%pCn pll1
- %pCr 1560000000
For printing struct clk structures. '%pC' and '%pCn' print the name
(Common Clock Framework) or address (legacy clock framework) of the
- structure; '%pCr' prints the current clock rate.
+ structure.
Passed by reference.
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1345,9 +1345,6 @@ char *clock(char *buf, char *end, struct
return string(buf, end, NULL, spec);
switch (fmt[1]) {
- case 'r':
- return number(buf, end, clk_get_rate(clk), spec);
-
case 'n':
default:
#ifdef CONFIG_COMMON_CLK
