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

[kernel/swap-modules.git] / preload / preload_module.c

diff --git a/preload/preload_module.c b/preload/preload_module.c
index c105fd0..0188344 100644 (file)
--- a/preload/preload_module.c
+++ b/preload/preload_module.c
@@ -138,7 +138,7 @@ static inline void __prepare_ujump(struct uretprobe_instance *ri,
                                   struct pt_regs *regs,
                                   unsigned long vaddr)
 {
-       ri->rp->up.kp.ss_addr[smp_processor_id()] = (kprobe_opcode_t *)vaddr;
+       ri->rp->up.ss_addr[smp_processor_id()] = (kprobe_opcode_t *)vaddr;
 
 #ifdef CONFIG_ARM
        if (thumb_mode(regs)) {
@@ -199,7 +199,7 @@ static inline void print_regs(const char *prefix, struct pt_regs *regs,
               "sp(%08lx), lr(%08lx), pc(%08lx)\n",
               current->comm, current->tgid, current->pid,
               (int)preload_pd_get_state(__get_process_data(ri->rp)),
-              prefix, (unsigned long)ri->rp->up.kp.addr,
+              prefix, (unsigned long)ri->rp->up.addr,
               regs->ARM_r0, regs->ARM_r1, regs->ARM_r2, regs->ARM_r3,
               regs->ARM_r4, regs->ARM_r5, regs->ARM_r6, regs->ARM_r7,
               regs->ARM_sp, regs->ARM_lr, regs->ARM_pc);
@@ -208,7 +208,7 @@ static inline void print_regs(const char *prefix, struct pt_regs *regs,
               "ip(%08lx), arg0(%08lx), arg1(%08lx), raddr(%08lx)\n",
               current->comm, current->tgid, current->pid,
               (int)preload_pd_get_state(__get_process_data(ri->rp)),
-              prefix, (unsigned long)ri->rp->up.kp.addr,
+              prefix, (unsigned long)ri->rp->up.addr,
               regs->EREG(ip), swap_get_arg(regs, 0), swap_get_arg(regs, 1),
               swap_get_ret_addr(regs));
 #endif /* CONFIG_ARM */
@@ -340,7 +340,7 @@ static inline struct vm_area_struct *__get_vma_by_addr(struct task_struct *task,
 
 static inline bool __inverted(struct us_ip *ip)
 {
-       unsigned long flags = ip->info->pl_i.flags;
+       unsigned long flags = ip->desc->info.pl_i.flags;
 
        if (flags & SWAP_PRELOAD_INVERTED_PROBE)
                return true;
@@ -369,7 +369,7 @@ static inline bool __check_flag_and_call_type(struct us_ip *ip,
 
 static inline bool __is_probe_non_block(struct us_ip *ip)
 {
-       if (ip->info->pl_i.flags & SWAP_PRELOAD_NON_BLOCK_PROBE)
+       if (ip->desc->info.pl_i.flags & SWAP_PRELOAD_NON_BLOCK_PROBE)
                return true;
 
        return false;
@@ -634,7 +634,7 @@ static int preload_us_entry(struct uretprobe_instance *ri, struct pt_regs *regs)
        struct us_ip *ip = container_of(ri->rp, struct us_ip, retprobe);
        struct us_priv *priv = (struct us_priv *)ri->data;
        unsigned long flags = get_preload_flags(current);
-       unsigned long offset = ip->info->pl_i.handler;
+       unsigned long offset = ip->desc->info.pl_i.handler;
        unsigned long vaddr = 0;
        unsigned long base;
        char __user *path = NULL;
@@ -730,7 +730,7 @@ static int preload_us_ret(struct uretprobe_instance *ri, struct pt_regs *regs)
        struct us_ip *ip = container_of(ri->rp, struct us_ip, retprobe);
        struct us_priv *priv = (struct us_priv *)ri->data;
        unsigned long flags = get_preload_flags(current);
-       unsigned long offset = ip->info->pl_i.handler;
+       unsigned long offset = ip->desc->info.pl_i.handler;
        unsigned long vaddr = 0;
 
        switch (preload_pd_get_state(pd)) {
@@ -792,7 +792,7 @@ static int preload_us_ret(struct uretprobe_instance *ri, struct pt_regs *regs)
 
 
 
-static int get_caller_handler(struct kprobe *p, struct pt_regs *regs)
+static int get_caller_handler(struct uprobe *p, struct pt_regs *regs)
 {
        unsigned long caller;
        int ret;
@@ -809,7 +809,7 @@ static int get_caller_handler(struct kprobe *p, struct pt_regs *regs)
        return 0;
 }
 
-static int get_call_type_handler(struct kprobe *p, struct pt_regs *regs)
+static int get_call_type_handler(struct uprobe *p, struct pt_regs *regs)
 {
        unsigned char call_type;
        int ret;
@@ -826,7 +826,7 @@ static int get_call_type_handler(struct kprobe *p, struct pt_regs *regs)
        return 0;
 }
 
-static int write_msg_handler(struct kprobe *p, struct pt_regs *regs)
+static int write_msg_handler(struct uprobe *p, struct pt_regs *regs)
 {
        char *user_buf;
        char *buf;
@@ -893,7 +893,7 @@ int preload_module_get_caller_init(struct us_ip *ip)
 {
        struct uprobe *up = &ip->uprobe;
 
-       up->kp.pre_handler = get_caller_handler;
+       up->pre_handler = get_caller_handler;
 
        return 0;
 }
@@ -906,7 +906,7 @@ int preload_module_get_call_type_init(struct us_ip *ip)
 {
        struct uprobe *up = &ip->uprobe;
 
-       up->kp.pre_handler = get_call_type_handler;
+       up->pre_handler = get_call_type_handler;
 
        return 0;
 }
@@ -919,7 +919,7 @@ int preload_module_write_msg_init(struct us_ip *ip)
 {
        struct uprobe *up = &ip->uprobe;
 
-       up->kp.pre_handler = write_msg_handler;
+       up->pre_handler = write_msg_handler;
 
        return 0;
 }