diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-07 09:16:32 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-07 09:16:32 -0800 |
| commit | ef0769db3027f9adb74a2ac174dcb9176bb33364 (patch) | |
| tree | f1ae637f81e189221dd160ff165a5016a7bcbff9 /include/linux/string.h | |
| parent | 296628bc78ed18bf18f9ff51546a0043fcdc73e8 (diff) | |
| parent | 8720164c1a8920c44bd6f2f9e7169f459eeb9019 (diff) | |
Merge "Merge android-4.4.118 (5f7f76a) into msm-4.4"
Diffstat (limited to 'include/linux/string.h')
| -rw-r--r-- | include/linux/string.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index aa30789b0f65..98bb781a2eff 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -122,6 +122,7 @@ extern char *kstrdup(const char *s, gfp_t gfp); extern const char *kstrdup_const(const char *s, gfp_t gfp); extern char *kstrndup(const char *s, size_t len, gfp_t gfp); extern void *kmemdup(const void *src, size_t len, gfp_t gfp); +extern char *kmemdup_nul(const char *s, size_t len, gfp_t gfp); extern char **argv_split(gfp_t gfp, const char *str, int *argcp); extern void argv_free(char **argv); |