diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-12 20:49:33 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-12 20:49:33 +0300 |
| commit | b1630da0589dbf520e4cf565eda6a74c5a813962 (patch) | |
| tree | 290df4d4e49d96ed4df1dfa68ead45991e85cd2e /include/linux/string.h | |
| parent | d5f9e73309b774dd9d86428edd7958b0960bcb85 (diff) | |
| parent | 25cb62b76430a91cc6195f902e61c2cb84ade622 (diff) | |
| download | linux-b1630da0589dbf520e4cf565eda6a74c5a813962.tar.xz | |
Merge 4.3-rc5 into usb-next
We want the USB fixes in here as well to make merges easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 |