diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-06 19:35:03 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-06 19:35:03 -0400 |
| commit | fccfb9950836524d79260448fba6131f6b1d73c3 (patch) | |
| tree | a6fef32e330852138d9e7bd12d7b3dd97c4360c3 /include/trace/events/syscalls.h | |
| parent | d597580d373774b1bdab84b3d26ff0b55162b916 (diff) | |
| parent | b4fb8f66f1ae2e167d06c12d018025a8d4d3ba7e (diff) | |
Merge commit 'b4fb8f66f1ae2e167d06c12d018025a8d4d3ba7e' into uaccess.ia64
backmerge of mainline ia64 fix
Diffstat (limited to 'include/trace/events/syscalls.h')
| -rw-r--r-- | include/trace/events/syscalls.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/trace/events/syscalls.h b/include/trace/events/syscalls.h index 14e49c798135..b35533b94277 100644 --- a/include/trace/events/syscalls.h +++ b/include/trace/events/syscalls.h @@ -1,5 +1,6 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM raw_syscalls +#undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE syscalls #if !defined(_TRACE_EVENTS_SYSCALLS_H) || defined(TRACE_HEADER_MULTI_READ) |