projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'printk-for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek...
[linux-2.6-microblaze.git]
/
lib
/
vsprintf.c
diff --git
a/lib/vsprintf.c
b/lib/vsprintf.c
index
6393704
..
b0967cf
100644
(file)
--- a/
lib/vsprintf.c
+++ b/
lib/vsprintf.c
@@
-599,7
+599,7
@@
static char *string_nocheck(char *buf, char *end, const char *s,
struct printf_spec spec)
{
int len = 0;
struct printf_spec spec)
{
int len = 0;
-
size_
t lim = spec.precision;
+
in
t lim = spec.precision;
while (lim--) {
char c = *s++;
while (lim--) {
char c = *s++;
@@
-1799,7
+1799,7
@@
char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec,
#ifdef CONFIG_COMMON_CLK
return string(buf, end, __clk_get_name(clk), spec);
#else
#ifdef CONFIG_COMMON_CLK
return string(buf, end, __clk_get_name(clk), spec);
#else
- return
error_string(buf, end, "(%pC?)"
, spec);
+ return
ptr_to_id(buf, end, clk
, spec);
#endif
}
}
#endif
}
}