diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-06-12 07:00:35 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-06-12 07:00:35 -0700 |
| commit | f445d05328a2d627c2fb70c79d8b01455c254609 (patch) | |
| tree | e46c5f112ba429f836c0c63719b928a8e14fb131 /include/linux/kernel.h | |
| parent | 668468b161745df666b75fbfb76d14155b0f9df6 (diff) | |
| parent | 3d85f548d3c84a13dc54cc9c79249c5fdae2ad36 (diff) | |
Merge branch 'dss-regulator' into omap-for-v3.11/fixes-non-critical
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"))) = \ |