diff options
| author |   Sage Weil <sage@inktank.com> | 2013-08-15 11:11:45 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-15 11:11:45 -0700 |
| commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
| tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /fs/pstore/ftrace.c | |
| parent | ceph: Remove bogus check in invalidatepage (diff) | |
| parent | Merge branch 'akpm' (patches from Andrew Morton) (diff) | |
| download | linux-dev-ee3e542fec6e69bc9fb668698889a37d93950ddf.tar.xz linux-dev-ee3e542fec6e69bc9fb668698889a37d93950ddf.zip | |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'fs/pstore/ftrace.c')
| -rw-r--r-- | fs/pstore/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pstore/ftrace.c b/fs/pstore/ftrace.c index 43b12807a51d..76a4eeb92982 100644 --- a/fs/pstore/ftrace.c +++ b/fs/pstore/ftrace.c @@ -44,7 +44,7 @@ static void notrace pstore_ftrace_call(unsigned long ip, rec.parent_ip = parent_ip; pstore_ftrace_encode_cpu(&rec, raw_smp_processor_id()); psinfo->write_buf(PSTORE_TYPE_FTRACE, 0, NULL, 0, (void *)&rec, - sizeof(rec), psinfo); + 0, sizeof(rec), psinfo); local_irq_restore(flags); } |