FIXED: conflict, smart pointers, brace mismatch

diff --git a/driver/storage.c b/driver/storage.c
index 5b40f6d..3e863c1 100644 (file)
--- a/driver/storage.c
+++ b/driver/storage.c
@@ -1131,7 +1131,7 @@ int link_bundle()
                kfree (addrs);
                kfree(s_lib.p_vtps);
        }
-
+       }
 
        /* Conds */
        /* first, delete all the conds */

diff --git a/driver/us_proc_inst.c b/driver/us_proc_inst.c
index b32a02c..4a4cdcc 100644 (file)
--- a/driver/us_proc_inst.c
+++ b/driver/us_proc_inst.c
@@ -448,12 +448,8 @@ static int install_mapped_ips (struct task_struct *task, inst_us_proc_t* task_in
                                                        task_inst_info->unres_ips_count--;
                                                        
                                                        err = register_usprobe (task, mm, &task_inst_info->p_libs[i].p_ips[k], atomic, 0);
-<<<<<<< HEAD
                                                        if (err != 0)
                                                        {
-=======
-                                                       if (!err) {
->>>>>>> branch 'refs/heads/master' of ssh://lastakhov@106.109.8.71/srv/git/dbi_new_build
                                                                DPRINTF ("failed to install IP at %lx/%p. Error %d!", task_inst_info->p_libs[i].p_ips[k].offset, 
                                                                                task_inst_info->p_libs[i].p_ips[k].jprobe.kp.addr);
                                                        }