diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-08-19 13:49:20 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-08-19 13:49:20 +1000 |
| commit | 3387ed83943daf6cb1bb4195ae369067b9cd80ce (patch) | |
| tree | e9fc247ed3a26f5369a7ec1b1bd0ef66bda7b4dd /include/linux/kernel.h | |
| parent | eb91626ac4b9af3d5602a7db888b8bc4cb23eb3b (diff) | |
| parent | 63b66e5ba54b15a6592be00555d762db6db739ce (diff) | |
| download | linux-3387ed83943daf6cb1bb4195ae369067b9cd80ce.tar.gz linux-3387ed83943daf6cb1bb4195ae369067b9cd80ce.tar.xz | |
Merge tag 'drm-intel-fixes-2013-08-15' of git://people.freedesktop.org/~danvet/drm-intel
* tag 'drm-intel-fixes-2013-08-15' of git://people.freedesktop.org/~danvet/drm-intel: (153 commits)
drm/i915: Don't deref pipe->cpu_transcoder in the hangcheck code
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) { } |