diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2018-02-16 16:07:07 -0500 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2018-04-11 04:32:42 -0400 |
| commit | 558594f3c2a5cd65f18b976faf68143c502b73b2 (patch) | |
| tree | d0be30080a4f12b09c8f2ffdd66f184c1f2ff433 | |
| parent | 544339730844674058e772084948cfcc9e62a3c5 (diff) | |
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>
| -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, | |||
| 1347 | return string(buf, end, uuid, spec); | 1347 | return string(buf, end, uuid, spec); |
| 1348 | } | 1348 | } |
| 1349 | 1349 | ||
| 1350 | static noinline_for_stack | ||
| 1351 | char *pointer_string(char *buf, char *end, const void *ptr, | ||
| 1352 | struct printf_spec spec) | ||
| 1353 | { | ||
| 1354 | spec.base = 16; | ||
| 1355 | spec.flags |= SMALL; | ||
| 1356 | if (spec.field_width == -1) { | ||
| 1357 | spec.field_width = 2 * sizeof(ptr); | ||
| 1358 | spec.flags |= ZEROPAD; | ||
| 1359 | } | ||
| 1360 | |||
| 1361 | return number(buf, end, (unsigned long int)ptr, spec); | ||
| 1362 | } | ||
| 1363 | |||
| 1350 | int kptr_restrict __read_mostly; | 1364 | int kptr_restrict __read_mostly; |
| 1351 | 1365 | ||
| 1352 | static noinline_for_stack | 1366 | static noinline_for_stack |
| @@ -1634,20 +1648,6 @@ char *device_node_string(char *buf, char *end, struct device_node *dn, | |||
| 1634 | return widen_string(buf, buf - buf_start, end, spec); | 1648 | return widen_string(buf, buf - buf_start, end, spec); |
| 1635 | } | 1649 | } |
| 1636 | 1650 | ||
| 1637 | static noinline_for_stack | ||
| 1638 | char *pointer_string(char *buf, char *end, const void *ptr, | ||
| 1639 | struct printf_spec spec) | ||
| 1640 | { | ||
| 1641 | spec.base = 16; | ||
| 1642 | spec.flags |= SMALL; | ||
| 1643 | if (spec.field_width == -1) { | ||
| 1644 | spec.field_width = 2 * sizeof(ptr); | ||
| 1645 | spec.flags |= ZEROPAD; | ||
| 1646 | } | ||
| 1647 | |||
| 1648 | return number(buf, end, (unsigned long int)ptr, spec); | ||
| 1649 | } | ||
| 1650 | |||
| 1651 | static bool have_filled_random_ptr_key __read_mostly; | 1651 | static bool have_filled_random_ptr_key __read_mostly; |
| 1652 | static siphash_key_t ptr_key __read_mostly; | 1652 | static siphash_key_t ptr_key __read_mostly; |
| 1653 | 1653 | ||
