diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 14:31:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 14:31:28 -0400 |
| commit | 8255309b887fcac11f791913a2d1d0b966a40d32 (patch) | |
| tree | ae2d43366b946ab0968762a2b68cc862983db372 /include | |
| parent | bf20753c0cdf842c5c65af688c2cefd1eafa7630 (diff) | |
| parent | 44e9c8b7adc52079f0535f9de0c2c2477831389b (diff) | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
tracing/filters: return proper error code when writing filter file
tracing/filters: allow user input integer to be oct or hex
tracing/filters: fix NULL pointer dereference
tracing/filters: NIL-terminate user input filter
ftrace: Output REC->var instead of __entry->var for trace format
Make __stringify support variable argument macros too
tracing: fix document references
tracing: fix splice return too large
tracing: update file->f_pos when splice(2) it
tracing: allocate page when needed
tracing: disable seeking for trace_pipe_raw
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/stringify.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/stringify.h b/include/linux/stringify.h index 0b4388356c87..841cec8ed525 100644 --- a/include/linux/stringify.h +++ b/include/linux/stringify.h | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | * converts to "bar". | 6 | * converts to "bar". |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #define __stringify_1(x) #x | 9 | #define __stringify_1(x...) #x |
| 10 | #define __stringify(x) __stringify_1(x) | 10 | #define __stringify(x...) __stringify_1(x) |
| 11 | 11 | ||
| 12 | #endif /* !__LINUX_STRINGIFY_H */ | 12 | #endif /* !__LINUX_STRINGIFY_H */ |