diff options
| author | Mark Brown <broonie@kernel.org> | 2015-09-04 17:16:39 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-09-04 17:16:39 +0100 |
| commit | 04782ca20a8ebb5acf0c35756a38964ae5ea7321 (patch) | |
| tree | ebf475793bb17444d3a1e21974617f27e8ff3a4b /include/linux/kernel.h | |
| parent | d5b98eb12420ce856caaf57dc5256eedc56a3747 (diff) | |
| parent | 17649c90ff4c5246bb4babf6260029968a6d119d (diff) | |
| download | cachepc-linux-04782ca20a8ebb5acf0c35756a38964ae5ea7321.tar.gz cachepc-linux-04782ca20a8ebb5acf0c35756a38964ae5ea7321.zip | |
Merge branch 'topic/smbus-block' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-core
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 5f0be58640ea..5582410727cb 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -411,7 +411,8 @@ extern __printf(3, 0) int vscnprintf(char *buf, size_t size, const char *fmt, va_list args); extern __printf(2, 3) char *kasprintf(gfp_t gfp, const char *fmt, ...); -extern char *kvasprintf(gfp_t gfp, const char *fmt, va_list args); +extern __printf(2, 0) +char *kvasprintf(gfp_t gfp, const char *fmt, va_list args); extern __scanf(2, 3) int sscanf(const char *, const char *, ...); @@ -679,10 +680,10 @@ do { \ __ftrace_vprintk(_THIS_IP_, fmt, vargs); \ } while (0) -extern int +extern __printf(2, 0) int __ftrace_vbprintk(unsigned long ip, const char *fmt, va_list ap); -extern int +extern __printf(2, 0) int __ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap); extern void ftrace_dump(enum ftrace_dump_mode oops_dump_mode); @@ -702,7 +703,7 @@ int trace_printk(const char *fmt, ...) { return 0; } -static inline int +static __printf(1, 0) inline int ftrace_vprintk(const char *fmt, va_list ap) { return 0; |