diff options
| author | David S. Miller <davem@davemloft.net> | 2011-09-16 07:09:02 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-16 07:09:02 +0200 |
| commit | 52b9aca7ae8726d1fb41b97dd1d243d107fef11b (patch) | |
| tree | 7acee111840bd25183513e9bde08e939ffd57be8 /arch/sh/include/asm/ptrace.h | |
| parent | pch_gbe: support ML7831 IOH (diff) | |
| parent | e1000: Fix driver to be used on PA RISC C8000 workstations (diff) | |
| download | linux-52b9aca7ae8726d1fb41b97dd1d243d107fef11b.tar.xz linux-52b9aca7ae8726d1fb41b97dd1d243d107fef11b.zip | |
Merge branch 'master' of ../netdev/
Diffstat (limited to 'arch/sh/include/asm/ptrace.h')
| -rw-r--r-- | arch/sh/include/asm/ptrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/ptrace.h b/arch/sh/include/asm/ptrace.h index b97baf81a87b..2d3679b2447f 100644 --- a/arch/sh/include/asm/ptrace.h +++ b/arch/sh/include/asm/ptrace.h @@ -123,7 +123,7 @@ static inline unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, struct perf_event; struct perf_sample_data; -extern void ptrace_triggered(struct perf_event *bp, int nmi, +extern void ptrace_triggered(struct perf_event *bp, struct perf_sample_data *data, struct pt_regs *regs); #define task_pt_regs(task) \ |