diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2018-02-16 23:07:07 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2018-04-11 10:32:42 +0200 |
| commit | 558594f3c2a5cd65f18b976faf68143c502b73b2 (patch) | |
| tree | d0be30080a4f12b09c8f2ffdd66f184c1f2ff433 /lib | |
| parent | 544339730844674058e772084948cfcc9e62a3c5 (diff) | |
| download | linux-stable-558594f3c2a5cd65f18b976faf68143c502b73b2.tar.gz linux-stable-558594f3c2a5cd65f18b976faf68143c502b73b2.tar.bz2 linux-stable-558594f3c2a5cd65f18b976faf68143c502b73b2.zip | |
lib/vsprintf: Move pointer_string() upper
As preparatory patch to further clean up.
No functional change.
Link: http://lkml.kernel.org/r/20180216210711.79901-5-andriy.shevchenko@linux.intel.com
To: "Tobin C . Harding" <me@tobin.cc>
To: linux@rasmusvillemoes.dk
To: Joe Perches <joe@perches.com>
To: linux-kernel@vger.kernel.org
To: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/vsprintf.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index c789d265311b..87dbced51b1a 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -1347,6 +1347,20 @@ char *uuid_string(char *buf, char *end, const u8 *addr, return string(buf, end, uuid, spec); } +static noinline_for_stack +char *pointer_string(char *buf, char *end, const void *ptr, + struct printf_spec spec) +{ + spec.base = 16; + spec.flags |= SMALL; + if (spec.field_width == -1) { + spec.field_width = 2 * sizeof(ptr); + spec.flags |= ZEROPAD; + } + + return number(buf, end, (unsigned long int)ptr, spec); +} + int kptr_restrict __read_mostly; static noinline_for_stack @@ -1634,20 +1648,6 @@ char *device_node_string(char *buf, char *end, struct device_node *dn, return widen_string(buf, buf - buf_start, end, spec); } -static noinline_for_stack -char *pointer_string(char *buf, char *end, const void *ptr, - struct printf_spec spec) -{ - spec.base = 16; - spec.flags |= SMALL; - if (spec.field_width == -1) { - spec.field_width = 2 * sizeof(ptr); - spec.flags |= ZEROPAD; - } - - return number(buf, end, (unsigned long int)ptr, spec); -} - static bool have_filled_random_ptr_key __read_mostly; static siphash_key_t ptr_key __read_mostly; |