diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-15 14:19:52 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-15 14:19:52 +0400 |
| commit | 4210606b19852dce52ed1a687db816695b6048e1 (patch) | |
| tree | fd0762f88dc54560d87fc1e523741d92228f6a9c /include/linux/kernel.h | |
| parent | 4d8cfa4642f7d8fafa4d60f05dd34fe8c3b9fa45 (diff) | |
| parent | b7ae6f31d8243ec684af16bc5c763eccdfabaec0 (diff) | |
| download | linux-4210606b19852dce52ed1a687db816695b6048e1.tar.xz | |
Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-pxa
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 3bef14c6586b..482ad2d84a32 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -629,7 +629,7 @@ extern void ftrace_dump(enum ftrace_dump_mode oops_dump_mode); static inline void tracing_start(void) { } static inline void tracing_stop(void) { } static inline void ftrace_off_permanent(void) { } -static inline void trace_dump_stack(void) { } +static inline void trace_dump_stack(int skip) { } static inline void tracing_on(void) { } static inline void tracing_off(void) { } |