diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-15 12:51:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-15 12:51:50 -0800 |
| commit | 75e300c8ba5864367634d946c729d8fd05c1cbc2 (patch) | |
| tree | 2ccbc619f482d453d18e5162649e3c2e7162673c /fs/pstore/ftrace.c | |
| parent | c13e69b2f0e1e2da41a175c7e9215659842cbef9 (diff) | |
| parent | ebacfd1ece3bfa46296fc92c6f996cb5f7fc75e6 (diff) | |
| download | linux-75e300c8ba5864367634d946c729d8fd05c1cbc2.tar.gz linux-75e300c8ba5864367634d946c729d8fd05c1cbc2.tar.bz2 linux-75e300c8ba5864367634d946c729d8fd05c1cbc2.zip | |
Merge tag 'for-v3.8' of git://git.infradead.org/users/cbou/linux-pstore
Pull pstore update from Anton Vorontsov:
"Here are just a few fixups for the pstore subsystem, nothing special
this time"
* tag 'for-v3.8' of git://git.infradead.org/users/cbou/linux-pstore:
pstore/ftrace: Adjust for ftrace_ops->func prototype change
pstore/ram: Fix bounds checks for mem_size, record_size, console_size and ftrace_size
pstore/ram: Fix undefined usage of rounddown_pow_of_two(0)
pstore/ram: Fixup section annotations
Diffstat (limited to 'fs/pstore/ftrace.c')
| -rw-r--r-- | fs/pstore/ftrace.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/pstore/ftrace.c b/fs/pstore/ftrace.c index 2d57e1ac0115..43b12807a51d 100644 --- a/fs/pstore/ftrace.c +++ b/fs/pstore/ftrace.c @@ -28,7 +28,9 @@ #include "internal.h" static void notrace pstore_ftrace_call(unsigned long ip, - unsigned long parent_ip) + unsigned long parent_ip, + struct ftrace_ops *op, + struct pt_regs *regs) { unsigned long flags; struct pstore_ftrace_record rec = {}; |