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

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

diff --git a/wsp/wsp.c b/wsp/wsp.c
index 8146031..296b077 100644 (file)
--- a/wsp/wsp.c
+++ b/wsp/wsp.c
@@ -45,11 +45,11 @@ static const char webapp_path[] = "/usr/bin/wrt_launchpad_daemon";
 static const char ewebkit_path[] = "/usr/lib/libewebkit2.so";
 
 
-#define WSP_PROBE_MAKE(_name, _info)   \
+#define WSP_PROBE_MAKE(__name, __desc) \
 {                                      \
-       .name = _name,                  \
+       .name = __name,                 \
        .probe.offset = 0,              \
-       .probe.info = _info             \
+       .probe.desc = __desc            \
 }
 
 
@@ -84,7 +84,7 @@ static void do_res_finish(struct wsp_res *res)
 /*
  * soup_req
  */
-static int soup_req_handle(struct kprobe *p, struct pt_regs *regs)
+static int soup_req_handle(struct uprobe *p, struct pt_regs *regs)
 {
        enum { max_str_len = 512 };
        const char __user *user_s;
@@ -111,13 +111,13 @@ static int soup_req_handle(struct kprobe *p, struct pt_regs *regs)
        return 0;
 }
 
-static struct probe_info_new soup_req = MAKE_UPROBE(soup_req_handle);
+static struct probe_desc soup_req = MAKE_UPROBE(soup_req_handle);
 
 
 /*
  * main_res_req
  */
-static int mres_req_handle(struct kprobe *p, struct pt_regs *regs)
+static int mres_req_handle(struct uprobe *p, struct pt_regs *regs)
 {
        void *ptr = (void *)swap_get_uarg(regs, 0);
        struct wsp_res *res;
@@ -129,7 +129,7 @@ static int mres_req_handle(struct kprobe *p, struct pt_regs *regs)
        return 0;
 }
 
-static struct probe_info_new mres_req = MAKE_UPROBE(mres_req_handle);
+static struct probe_desc mres_req = MAKE_UPROBE(mres_req_handle);
 
 
 /*
@@ -155,7 +155,7 @@ static int mres_adata_rh(struct uretprobe_instance *ri, struct pt_regs *regs)
        return 0;
 }
 
-static struct probe_info_new mres_adata =
+static struct probe_desc mres_adata =
                MAKE_URPROBE(mres_adata_eh, mres_adata_rh,
                             sizeof(struct wsp_res *));
 
@@ -163,7 +163,7 @@ static struct probe_info_new mres_adata =
 /*
  * main_res_finish
  */
-static int mres_finish_handle(struct kprobe *p, struct pt_regs *regs)
+static int mres_finish_handle(struct uprobe *p, struct pt_regs *regs)
 {
        void *ptr = (void *)swap_get_uarg(regs, 0);
        struct wsp_res *res;
@@ -177,13 +177,13 @@ static int mres_finish_handle(struct kprobe *p, struct pt_regs *regs)
        return 0;
 }
 
-static struct probe_info_new mres_finish = MAKE_UPROBE(mres_finish_handle);
+static struct probe_desc mres_finish = MAKE_UPROBE(mres_finish_handle);
 
 
 /*
  * res_request
  */
-static int res_request_handle(struct kprobe *p, struct pt_regs *regs)
+static int res_request_handle(struct uprobe *p, struct pt_regs *regs)
 {
        void *ptr = (void *)swap_get_uarg(regs, 0);
        struct wsp_res *res;
@@ -202,7 +202,7 @@ static int res_request_handle(struct kprobe *p, struct pt_regs *regs)
        return 0;
 }
 
-static struct probe_info_new res_request = MAKE_UPROBE(res_request_handle);
+static struct probe_desc res_request = MAKE_UPROBE(res_request_handle);
 
 
 /*
@@ -231,7 +231,7 @@ static int res_finish_rhandle(struct uretprobe_instance *ri,
        return 0;
 }
 
-static struct probe_info_new res_finish =
+static struct probe_desc res_finish =
                MAKE_URPROBE(res_finish_ehandle, res_finish_rhandle,
                             sizeof(struct wsp_res *));
 
@@ -261,7 +261,7 @@ static int redraw_rh(struct uretprobe_instance *ri, struct pt_regs *regs)
        return 0;
 }
 
-static struct probe_info_new redraw = MAKE_URPROBE(redraw_eh, redraw_rh, 0);
+static struct probe_desc redraw = MAKE_URPROBE(redraw_eh, redraw_rh, 0);
 
 
 static struct wsp_probe ewebkit_probe_array[] = {