diff options
| author | Chris Zankel <chris@zankel.net> | 2013-07-08 01:10:26 -0700 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2013-07-08 01:10:26 -0700 |
| commit | 033d777f548645c3a906b73eef5d665aeee55092 (patch) | |
| tree | 707dd7757ed59882fb1ecaf73313c325fa20dec8 /include/linux/kernel.h | |
| parent | fd95ee7380ae973c6f11b897af6ef9d253a1df9e (diff) | |
| parent | 73b0cd674ccc64c921e25bd7154f26d342116539 (diff) | |
Merge branch 'timers-core-for-linus' of https://git.kernel.org/cgit/linux/kernel/git/tip/tip into tst5
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index e96329ceb28c..e9ef6d6b51d5 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -562,6 +562,9 @@ int __trace_bprintk(unsigned long ip, const char *fmt, ...); extern __printf(2, 3) int __trace_printk(unsigned long ip, const char *fmt, ...); +extern int __trace_bputs(unsigned long ip, const char *str); +extern int __trace_puts(unsigned long ip, const char *str, int size); + /** * trace_puts - write a string into the ftrace buffer * @str: the string to record @@ -587,8 +590,6 @@ int __trace_printk(unsigned long ip, const char *fmt, ...); * (1 when __trace_bputs is used, strlen(str) when __trace_puts is used) */ -extern int __trace_bputs(unsigned long ip, const char *str); -extern int __trace_puts(unsigned long ip, const char *str, int size); #define trace_puts(str) ({ \ static const char *trace_printk_fmt \ __attribute__((section("__trace_printk_fmt"))) = \ |