summaryrefslogtreecommitdiff
path: root/kprobe
diff options
context:
space:
mode:
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>2013-09-18 15:22:26 +0400
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>2013-09-18 15:22:26 +0400
commitfd50a7f3e8008ebbf626089141a08bac3b74bbc9 (patch)
tree95488f92e1b7aa0a898a76088091877a895a3d9d /kprobe
parent6129095cde9353a3c9fe4a542b03a53cff996e45 (diff)
downloadswap-modules-fd50a7f3e8008ebbf626089141a08bac3b74bbc9.tar.gz
swap-modules-fd50a7f3e8008ebbf626089141a08bac3b74bbc9.tar.bz2
swap-modules-fd50a7f3e8008ebbf626089141a08bac3b74bbc9.zip
[REFACTOR] remove field priv_arg from struct kretprobe
Change-Id: I532dec6facbcd6982c45a3fbfa2e0af1d9ce0e0d Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>
Diffstat (limited to 'kprobe')
-rw-r--r--kprobe/dbi_kprobes.c4
-rw-r--r--kprobe/dbi_kprobes.h3
2 files changed, 3 insertions, 4 deletions
diff --git a/kprobe/dbi_kprobes.c b/kprobe/dbi_kprobes.c
index 964eb0d0..f389e595 100644
--- a/kprobe/dbi_kprobes.c
+++ b/kprobe/dbi_kprobes.c
@@ -638,7 +638,7 @@ static int pre_handler_kretprobe(struct kprobe *p, struct pt_regs *regs)
ri->task = current;
if (rp->entry_handler) {
- rp->entry_handler(ri, regs, ri->rp->priv_arg);
+ rp->entry_handler(ri, regs);
}
arch_prepare_kretprobe(ri, regs);
@@ -703,7 +703,7 @@ int trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
if (ri->rp && ri->rp->handler) {
__get_cpu_var(current_kprobe) = &ri->rp->kp;
get_kprobe_ctlblk()->kprobe_status = KPROBE_HIT_ACTIVE;
- ri->rp->handler(ri, regs, ri->rp->priv_arg);
+ ri->rp->handler(ri, regs);
__get_cpu_var(current_kprobe) = NULL;
}
diff --git a/kprobe/dbi_kprobes.h b/kprobe/dbi_kprobes.h
index 7622740b..b0beec91 100644
--- a/kprobe/dbi_kprobes.h
+++ b/kprobe/dbi_kprobes.h
@@ -92,7 +92,7 @@ typedef int (*kprobe_pre_handler_t) (struct kprobe *, struct pt_regs *);
typedef int (*kprobe_break_handler_t) (struct kprobe *, struct pt_regs *);
typedef void (*kprobe_post_handler_t) (struct kprobe *, struct pt_regs *, unsigned long flags);
typedef int (*kprobe_fault_handler_t) (struct kprobe *, struct pt_regs *, int trapnr);
-typedef int (*kretprobe_handler_t) (struct kretprobe_instance *, struct pt_regs *, void *);
+typedef int (*kretprobe_handler_t) (struct kretprobe_instance *, struct pt_regs *);
struct kprobe
{
@@ -195,7 +195,6 @@ struct kretprobe
struct kprobe kp;
kretprobe_handler_t handler;
kretprobe_handler_t entry_handler;
- void *priv_arg;
int maxactive;
int nmissed;
size_t data_size;