diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-10 11:03:28 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-10 11:03:28 +1100 |
| commit | 0d1bad36c15f0a6b47f8f84e20024d3ce653eb12 (patch) | |
| tree | 7181873ea342d6829a40473c18994032d70d7dd1 /lib | |
| parent | d1ae62f438f26ecf256e5e4dd7cb53884c7dd3ab (diff) | |
| parent | 9b5e50a16f0712576db6d272b35b54cf6db259ad (diff) | |
Merge remote-tracking branch 'kspp/for-next/kspp'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/string.c | 3 | ||||
| -rw-r--r-- | lib/vsprintf.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/string.c b/lib/string.c index ed83562a53ae..b3c22a285a78 100644 --- a/lib/string.c +++ b/lib/string.c @@ -870,7 +870,8 @@ void *memchr(const void *s, int c, size_t n) EXPORT_SYMBOL(memchr); #endif -static void *check_bytes8(const u8 *start, u8 value, unsigned int bytes) +static __nocapture(1) +void *check_bytes8(const u8 *start, u8 value, unsigned int bytes) { while (bytes) { if (*start != value) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index e3bf4e0f10b5..40d3cb42b0e7 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -118,7 +118,7 @@ long long simple_strtoll(const char *cp, char **endp, unsigned int base) } EXPORT_SYMBOL(simple_strtoll); -static noinline_for_stack +static noinline_for_stack __nocapture(1) __unverified_nocapture(1) int skip_atoi(const char **s) { int i = 0; @@ -1570,7 +1570,7 @@ int kptr_restrict __read_mostly; * function pointers are really function descriptors, which contain a * pointer to the real address. */ -static noinline_for_stack +static noinline_for_stack __nocapture(1) __unverified_nocapture(1) char *pointer(const char *fmt, char *buf, char *end, void *ptr, struct printf_spec spec) { @@ -1750,7 +1750,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, * @precision: precision of a number * @qualifier: qualifier of a number (long, size_t, ...) */ -static noinline_for_stack +static noinline_for_stack __nocapture(1) int format_decode(const char *fmt, struct printf_spec *spec) { const char *start = fmt; |