Merge branch 'tizen_2.4' into tizen_2.4_dev

[kernel/swap-modules.git] / fbiprobe / fbiprobe.c

diff --git a/fbiprobe/fbiprobe.c b/fbiprobe/fbiprobe.c
index 9690294..535921c 100644 (file)
--- a/fbiprobe/fbiprobe.c
+++ b/fbiprobe/fbiprobe.c
@@ -255,15 +255,14 @@ exit:
        return 0;
 }
 
-static int fbi_probe_handler(struct kprobe *p, struct pt_regs *regs)
+static int fbi_probe_handler(struct uprobe *p, struct pt_regs *regs)
 {
-       struct uprobe *up = container_of(p, struct uprobe, kp);
-       struct us_ip *ip = container_of(up, struct us_ip, uprobe);
-       struct fbi_info *fbi_i = &ip->info->fbi_i;
+       struct us_ip *ip = container_of(p, struct us_ip, uprobe);
+       struct fbi_info *fbi_i = &ip->desc->info.fbi_i;
        struct fbi_var_data *fbi_d = NULL;
        uint8_t i;
 
-       if (ip->info->probe_type != SWAP_FBIPROBE) {
+       if (ip->desc->type != SWAP_FBIPROBE) {
                /* How this can occure? Doesn't matter, just print and go */
                print_err("Not FBI probe in FBI handler!\n");
                return 0;
@@ -308,13 +307,13 @@ void fbi_probe_cleanup(struct probe_info *probe_i)
 
 void fbi_probe_init(struct us_ip *ip)
 {
-       ip->uprobe.kp.pre_handler = (kprobe_pre_handler_t)fbi_probe_handler;
+       ip->uprobe.pre_handler = (uprobe_pre_handler_t)fbi_probe_handler;
 }
 
 void fbi_probe_uninit(struct us_ip *ip)
 {
        if (ip != NULL)
-               fbi_probe_cleanup(ip->info);
+               fbi_probe_cleanup(&ip->desc->info);
 }
 
 static int fbi_probe_register_probe(struct us_ip *ip)