summaryrefslogtreecommitdiff
path: root/include/linux/string.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-04-09 02:08:02 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-04-09 02:08:02 +0300
commit4b42fafc1cdc4aba38d4f147cb2f3f1a32cd4a15 (patch)
tree7f162d0612f7048dc52a3ba320a6685593100729 /include/linux/string.h
parentb318556479cc923970a79d6c2311138581c0db83 (diff)
parent6c9d9c81924b4b63c7a487e90fddb3b2d0f7d458 (diff)
downloadlinux-4b42fafc1cdc4aba38d4f147cb2f3f1a32cd4a15.tar.xz
Merge branch 'pm-cpufreq-sched' into pm-cpufreq
Diffstat (limited to 'include/linux/string.h')
-rw-r--r--include/linux/string.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/string.h b/include/linux/string.h
index 9eebc66d957a..d3993a79a325 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -128,7 +128,13 @@ extern char **argv_split(gfp_t gfp, const char *str, int *argcp);
extern void argv_free(char **argv);
extern bool sysfs_streq(const char *s1, const char *s2);
-extern int strtobool(const char *s, bool *res);
+extern int kstrtobool(const char *s, bool *res);
+static inline int strtobool(const char *s, bool *res)
+{
+ return kstrtobool(s, res);
+}
+
+int match_string(const char * const *array, size_t n, const char *string);
#ifdef CONFIG_BINARY_PRINTF
int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args);