diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-02 09:41:56 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-02 09:41:56 -0400 |
| commit | 29c798fecb9b846b363b0a02fa662ff42fc19426 (patch) | |
| tree | e708d6aca8f098e69571780f702325b221b66694 /kernel/trace/trace_stack.c | |
| parent | cb9906229595941d632fc4022b05da4f9533856a (diff) | |
| parent | c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 (diff) | |
Merge commit 'v2.6.37-rc1' into for-2.6.37
Diffstat (limited to 'kernel/trace/trace_stack.c')
| -rw-r--r-- | kernel/trace/trace_stack.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index a6b7e0e0f3eb..4c5dead0c239 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c | |||
| @@ -195,6 +195,7 @@ static const struct file_operations stack_max_size_fops = { | |||
| 195 | .open = tracing_open_generic, | 195 | .open = tracing_open_generic, |
| 196 | .read = stack_max_size_read, | 196 | .read = stack_max_size_read, |
| 197 | .write = stack_max_size_write, | 197 | .write = stack_max_size_write, |
| 198 | .llseek = default_llseek, | ||
| 198 | }; | 199 | }; |
| 199 | 200 | ||
| 200 | static void * | 201 | static void * |