diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-06 17:05:36 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-06 17:05:36 +0200 |
| commit | fe19159225d8516f3f57a5fe8f735c01684f0ddd (patch) | |
| tree | 1a41faa5ef5139485f4afabd6bb9d3977c0a115b /include/linux/string.h | |
| parent | c6e1e7b5b7f031910850ddaf7bfa65ba3b4843ea (diff) | |
| parent | 95913d97914f44db2b81271c2e2ebd4d2ac2df83 (diff) | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/string.h')
| -rw-r--r-- | include/linux/string.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index a8d90db9c4b0..9ef7795e65e4 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -25,6 +25,9 @@ extern char * strncpy(char *,const char *, __kernel_size_t); #ifndef __HAVE_ARCH_STRLCPY size_t strlcpy(char *, const char *, size_t); #endif +#ifndef __HAVE_ARCH_STRSCPY +ssize_t __must_check strscpy(char *, const char *, size_t); +#endif #ifndef __HAVE_ARCH_STRCAT extern char * strcat(char *, const char *); #endif |