These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / lib / kasprintf.c

diff --git a/kernel/lib/kasprintf.c b/kernel/lib/kasprintf.c
index 32f1215..f194e6e 100644 (file)
--- a/kernel/lib/kasprintf.c
+++ b/kernel/lib/kasprintf.c
@@ -31,6 +31,22 @@ char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap)
 }
 EXPORT_SYMBOL(kvasprintf);
 
+/*
+ * If fmt contains no % (or is exactly %s), use kstrdup_const. If fmt
+ * (or the sole vararg) points to rodata, we will then save a memory
+ * allocation and string copy. In any case, the return value should be
+ * freed using kfree_const().
+ */
+const char *kvasprintf_const(gfp_t gfp, const char *fmt, va_list ap)
+{
+       if (!strchr(fmt, '%'))
+               return kstrdup_const(fmt, gfp);
+       if (!strcmp(fmt, "%s"))
+               return kstrdup_const(va_arg(ap, const char*), gfp);
+       return kvasprintf(gfp, fmt, ap);
+}
+EXPORT_SYMBOL(kvasprintf_const);
+
 char *kasprintf(gfp_t gfp, const char *fmt, ...)
 {
        va_list ap;