[STYLE] Fix issues from checkpatch.pl

Change-Id: If8e13541e385dc6ff98d2b5af8fb20f2d99c9492
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>

diff --git a/driver/device_driver.c b/driver/device_driver.c
index d89199a..342b3b8 100644 (file)
--- a/driver/device_driver.c
+++ b/driver/device_driver.c
@@ -40,7 +40,7 @@
 #include <linux/module.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #include <ksyms/ksyms.h>
 #include <master/swap_initializer.h>

diff --git a/driver/driver_to_buffer.c b/driver/driver_to_buffer.c
index a24916e..fe68d82 100644 (file)
--- a/driver/driver_to_buffer.c
+++ b/driver/driver_to_buffer.c
@@ -30,7 +30,7 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/splice.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/spinlock.h>
 #include <linux/mm.h>
 

diff --git a/kprobe/arch/arm/swap-asm/swap_kprobes.c b/kprobe/arch/arm/swap-asm/swap_kprobes.c
index 1a1e3d8..313475f 100644 (file)
--- a/kprobe/arch/arm/swap-asm/swap_kprobes.c
+++ b/kprobe/arch/arm/swap-asm/swap_kprobes.c
@@ -48,7 +48,7 @@
 
 #include <asm/cacheflush.h>
 #include <asm/traps.h>
-#include <asm/ptrace.h>
+#include <linux/ptrace.h>
 #include <linux/list.h>
 #include <linux/hash.h>
 

diff --git a/ks_features/ks_features.c b/ks_features/ks_features.c
index 59a22c1..d3fc532 100644 (file)
--- a/ks_features/ks_features.c
+++ b/ks_features/ks_features.c
@@ -30,8 +30,7 @@
 
 #include <linux/module.h>
 #include <linux/slab.h>
-
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <ksyms/ksyms.h>
 #include <kprobe/swap_kprobes.h>
 #include <master/swap_initializer.h>
@@ -300,7 +299,7 @@ static int unregister_multiple_syscalls(size_t *id_p, size_t cnt)
 
        --cnt;
 
-       rpp = kmalloc(GFP_KERNEL, sizeof(&(((struct ks_probe *) 0)->rp)) * cnt);
+       rpp = kmalloc(sizeof(*rpp) * cnt, GFP_KERNEL);
        if (rpp == NULL) {
                for (; cnt != end; --cnt) {
                        ret = unregister_syscall(id_p[cnt]);

diff --git a/ks_features/syscall_list.h b/ks_features/syscall_list.h
index 5eee898..ee04553 100644 (file)
--- a/ks_features/syscall_list.h
+++ b/ks_features/syscall_list.h
@@ -64,7 +64,7 @@
        X(sys_fchownat, dsddd), \
        X(sys_fgetxattr, dspx), \
        X(sys_flistxattr, dpx), \
-       X(sys_fork,), \
+       X(sys_fork, /* empty */), \
        X(sys_fremovexattr, ds), \
        X(sys_fstat64, xp), \
        X(sys_ftruncate64, dx), \
@@ -75,7 +75,7 @@
        X(sys_getsockopt, dddpd), \
        X(sys_getxattr, sspx), \
        X(sys_inotify_add_watch, dsd), \
-       X(sys_inotify_init,), \
+       X(sys_inotify_init, /* empty */), \
        X(sys_inotify_init1, d), \
        X(sys_inotify_rm_watch, dd), \
        X(sys_ipc, ddxxpx), \
@@ -102,7 +102,7 @@
        X(sys_openat, dsdd), \
        X(sys_open_by_handle_at, dpd), \
        X(sys_open, sdd), \
-       X(sys_pause,), \
+       X(sys_pause, /* empty */), \
        X(sys_pipe2, dd), \
        X(sys_ppoll, pdpp), \
        X(sys_pread64, dpxx), \
@@ -180,7 +180,7 @@
        X(sys_utimensat, dspd), \
        X(sys_utime, pp), \
        X(sys_utimes, pp), \
-       X(sys_vfork,), \
+       X(sys_vfork, /* empty */), \
        X(sys_vmsplice, dpxd), \
        X(sys_wait4, dddp), \
        X(sys_waitid, ddpdp)

diff --git a/ksyms/no_ksyms.c b/ksyms/no_ksyms.c
index 7157a3d..a5ecb81 100644 (file)
--- a/ksyms/no_ksyms.c
+++ b/ksyms/no_ksyms.c
@@ -34,7 +34,7 @@
 #include <linux/semaphore.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
-#include <asm/fcntl.h>
+#include <linux/fcntl.h>
 
 /**
  * @def KSYMS_ERR

diff --git a/master/swap_debugfs.c b/master/swap_debugfs.c
index d41b3d4..d3042b4 100644 (file)
--- a/master/swap_debugfs.c
+++ b/master/swap_debugfs.c
@@ -22,7 +22,7 @@
 
 #include <linux/module.h>
 #include <linux/debugfs.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include "swap_initializer.h"
 
 

diff --git a/parser/swap_msg_parser.c b/parser/swap_msg_parser.c
index b41df9b..487da22 100644 (file)
--- a/parser/swap_msg_parser.c
+++ b/parser/swap_msg_parser.c
@@ -32,7 +32,7 @@
 #include <linux/module.h>
 #include <linux/vmalloc.h>
 #include <linux/cpumask.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #include "parser_defs.h"
 #include "msg_buf.h"

diff --git a/sampler/swap_sampler_module.c b/sampler/swap_sampler_module.c
index 98e54a0..c1a2b27 100644 (file)
--- a/sampler/swap_sampler_module.c
+++ b/sampler/swap_sampler_module.c
@@ -28,7 +28,7 @@
  * Timer-based sampling module.
  */
 
-#include <asm/ptrace.h>
+#include <linux/ptrace.h>
 #include <linux/jiffies.h>
 #include <linux/sched.h>
 #include <linux/notifier.h>

diff --git a/uprobe/arch/arm/swap-asm/swap_uprobes.c b/uprobe/arch/arm/swap-asm/swap_uprobes.c
index 6585ef7..da6ae8c 100644 (file)
--- a/uprobe/arch/arm/swap-asm/swap_uprobes.c
+++ b/uprobe/arch/arm/swap-asm/swap_uprobes.c
@@ -34,7 +34,7 @@
 #include <linux/init.h>                        /* need for asm/traps.h */
 #include <linux/sched.h>               /* need for asm/traps.h */
 
-#include <asm/ptrace.h>                        /* need for asm/traps.h */
+#include <linux/ptrace.h>              /* need for asm/traps.h */
 #include <asm/traps.h>
 
 #include <kprobe/swap_slots.h>
@@ -180,73 +180,59 @@ static int prep_pc_dep_insn_execbuf_thumb(kprobe_opcode_t *insns,
        unsigned char mreg = 0;
        unsigned char reg = 0;
 
-       if (THUMB_INSN_MATCH(APC, insn) || THUMB_INSN_MATCH(LRO3, insn)) {
+       if (THUMB_INSN_MATCH(APC, insn) ||
+           THUMB_INSN_MATCH(LRO3, insn)) {
                reg = ((insn & 0xffff) & uregs) >> 8;
-       } else {
-               if (THUMB_INSN_MATCH(MOV3, insn)) {
-                       if (((((unsigned char)insn) & 0xff) >> 3) == 15)
-                               reg = (insn & 0xffff) & uregs;
-                       else
-                               return 0;
-               } else {
-                       if (THUMB2_INSN_MATCH(ADR, insn)) {
-                               reg = ((insn >> 16) & uregs) >> 8;
-                               if (reg == 15)
-                                       return 0;
-                       } else {
-                               if (THUMB2_INSN_MATCH(LDRW, insn) ||
-                                   THUMB2_INSN_MATCH(LDRW1, insn) ||
-                                   THUMB2_INSN_MATCH(LDRHW, insn) ||
-                                   THUMB2_INSN_MATCH(LDRHW1, insn) ||
-                                   THUMB2_INSN_MATCH(LDRWL, insn)) {
-                                       reg = ((insn >> 16) & uregs) >> 12;
-                                       if (reg == 15)
-                                               return 0;
-                               } else {
-                                       /* LDRB.W PC, [PC, #immed] =>
-                                          PLD [PC, #immed],
-                                          so Rt == PC is skipped */
-                                       if (THUMB2_INSN_MATCH(LDRBW, insn) ||
-                                           THUMB2_INSN_MATCH(LDRBW1, insn) ||
-                                           THUMB2_INSN_MATCH(LDREX, insn)) {
-                                               reg = ((insn >> 16) & uregs) >> 12;
-                                       } else {
-                                               if (THUMB2_INSN_MATCH(DP, insn)) {
-                                                       reg = ((insn >> 16) & uregs) >> 12;
-                                                       if (reg == 15)
-                                                               return 0;
-                                               } else {
-                                                       if (THUMB2_INSN_MATCH(RSBW, insn)) {
-                                                               reg = ((insn >> 12) & uregs) >> 8;
-                                                               if (reg == 15)
-                                                                       return 0;
-                                                       } else {
-                                                               if (THUMB2_INSN_MATCH(RORW, insn)) {
-                                                                       reg = ((insn >> 12) & uregs) >> 8;
-                                                                       if (reg == 15)
-                                                                               return 0;
-                                                               } else {
-                                                                       if (THUMB2_INSN_MATCH(ROR, insn) || THUMB2_INSN_MATCH(LSLW1, insn) ||
-                                                                           THUMB2_INSN_MATCH(LSLW2, insn) || THUMB2_INSN_MATCH(LSRW1, insn) ||
-                                                                           THUMB2_INSN_MATCH(LSRW2, insn)) {
-                                                                               reg = ((insn >> 12) & uregs) >> 8;
-                                                                               if (reg == 15)
-                                                                                       return 0;
-                                                                       } else {
-                                                                               if (THUMB2_INSN_MATCH(TEQ1, insn) || THUMB2_INSN_MATCH(TST1, insn)) {
-                                                                                       reg = 15;
-                                                                               } else {
-                                                                                       if (THUMB2_INSN_MATCH(TEQ2, insn) || THUMB2_INSN_MATCH(TST2, insn))
-                                                                                               reg = THUMB2_INSN_REG_RM(insn);
-                                                                               }
-                                                                       }
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
+       } else if (THUMB_INSN_MATCH(MOV3, insn)) {
+               if (((((unsigned char)insn) & 0xff) >> 3) == 15)
+                       reg = (insn & 0xffff) & uregs;
+               else
+                       return 0;
+       } else if (THUMB2_INSN_MATCH(ADR, insn)) {
+               reg = ((insn >> 16) & uregs) >> 8;
+               if (reg == 15)
+                       return 0;
+       } else if (THUMB2_INSN_MATCH(LDRW, insn) ||
+                  THUMB2_INSN_MATCH(LDRW1, insn) ||
+                  THUMB2_INSN_MATCH(LDRHW, insn) ||
+                  THUMB2_INSN_MATCH(LDRHW1, insn) ||
+                  THUMB2_INSN_MATCH(LDRWL, insn)) {
+               reg = ((insn >> 16) & uregs) >> 12;
+               if (reg == 15)
+                       return 0;
+       /*
+        * LDRB.W PC, [PC, #immed] => PLD [PC, #immed], so Rt == PC is skipped
+        */
+       } else if (THUMB2_INSN_MATCH(LDRBW, insn) ||
+                  THUMB2_INSN_MATCH(LDRBW1, insn) ||
+                  THUMB2_INSN_MATCH(LDREX, insn)) {
+               reg = ((insn >> 16) & uregs) >> 12;
+       } else if (THUMB2_INSN_MATCH(DP, insn)) {
+               reg = ((insn >> 16) & uregs) >> 12;
+               if (reg == 15)
+                       return 0;
+       } else if (THUMB2_INSN_MATCH(RSBW, insn)) {
+               reg = ((insn >> 12) & uregs) >> 8;
+               if (reg == 15)
+                       return 0;
+       } else if (THUMB2_INSN_MATCH(RORW, insn)) {
+               reg = ((insn >> 12) & uregs) >> 8;
+               if (reg == 15)
+                       return 0;
+       } else if (THUMB2_INSN_MATCH(ROR, insn) ||
+                  THUMB2_INSN_MATCH(LSLW1, insn) ||
+                  THUMB2_INSN_MATCH(LSLW2, insn) ||
+                  THUMB2_INSN_MATCH(LSRW1, insn) ||
+                  THUMB2_INSN_MATCH(LSRW2, insn)) {
+               reg = ((insn >> 12) & uregs) >> 8;
+               if (reg == 15)
+                       return 0;
+       } else if (THUMB2_INSN_MATCH(TEQ1, insn) ||
+                  THUMB2_INSN_MATCH(TST1, insn)) {
+               reg = 15;
+       } else if (THUMB2_INSN_MATCH(TEQ2, insn) ||
+                  THUMB2_INSN_MATCH(TST2, insn)) {
+               reg = THUMB2_INSN_REG_RM(insn);
        }
 
        if ((THUMB2_INSN_MATCH(STRW, insn) ||
@@ -285,100 +271,95 @@ static int prep_pc_dep_insn_execbuf_thumb(kprobe_opcode_t *insns,
        if (THUMB_INSN_MATCH(APC, insn)) {
                /* ADD Rd, PC, #immed_8*4 -> ADD Rd, SP, #immed_8*4 */
                *((unsigned short *)insns + 4) = ((insn & 0xffff) | 0x800);
-       } else {
-               if (THUMB_INSN_MATCH(LRO3, insn)) {
-                       /* LDR Rd, [PC, #immed_8*4] ->
-                        * LDR Rd, [SP, #immed_8*4] */
-                       *((unsigned short *)insns + 4) =
-                               ((insn & 0xffff) + 0x5000);
-               } else {
-                       if (THUMB_INSN_MATCH(MOV3, insn)) {
-                               /* MOV Rd, PC -> MOV Rd, SP */
-                               *((unsigned short *)insns + 4) =
-                                       ((insn & 0xffff) ^ 0x10);
-                       } else {
-                               if (THUMB2_INSN_MATCH(ADR, insn)) {
-                                       /* ADDW Rd,PC,#imm -> ADDW Rd,SP,#imm */
-                                       insns[2] = (insn & 0xfffffff0) | 0x0d;
-                               } else {
-                                       if (THUMB2_INSN_MATCH(LDRW, insn) ||
-                                           THUMB2_INSN_MATCH(LDRBW, insn) ||
-                                           THUMB2_INSN_MATCH(LDRHW, insn)) {
-                                               /* LDR.W Rt, [PC, #-<imm_12>] ->
-                                                * LDR.W Rt, [SP, #-<imm_8>]
-                                                * !!!!!!!!!!!!!!!!!!!!!!!!
-                                                * !!! imm_12 vs. imm_8 !!!
-                                                * !!!!!!!!!!!!!!!!!!!!!!!! */
-                                               insns[2] = (insn & 0xf0fffff0) | 0x0c00000d;
-                                       } else {
-                                               if (THUMB2_INSN_MATCH(LDRW1, insn) ||
-                                                   THUMB2_INSN_MATCH(LDRBW1, insn) ||
-                                                   THUMB2_INSN_MATCH(LDRHW1, insn) ||
-                                                   THUMB2_INSN_MATCH(LDRD, insn) ||
-                                                   THUMB2_INSN_MATCH(LDRD1, insn) ||
-                                                   THUMB2_INSN_MATCH(LDREX, insn)) {
-                                                       /* LDRx.W Rt, [PC, #+<imm_12>] ->
-                                                        * LDRx.W Rt, [SP, #+<imm_12>]
-                                                        (+/-imm_8 for LDRD Rt, Rt2, [PC, #<imm_8>] */
-                                                       insns[2] = (insn & 0xfffffff0) | 0xd;
-                                               } else {
-                                                       if (THUMB2_INSN_MATCH(MUL, insn)) {
-                                                               insns[2] = (insn & 0xfff0ffff) | 0x000d0000; /* MUL Rd, Rn, SP */
-                                                       } else {
-                                                               if (THUMB2_INSN_MATCH(DP, insn)) {
-                                                                       if (THUMB2_INSN_REG_RM(insn) == 15)
-                                                                               insns[2] = (insn & 0xfff0ffff) | 0x000d0000; /* DP Rd, Rn, PC */
-                                                                       else if (THUMB2_INSN_REG_RN(insn) == 15)
-                                                                               insns[2] = (insn & 0xfffffff0) | 0xd; /* DP Rd, PC, Rm */
-                                                               } else {
-                                                                       if (THUMB2_INSN_MATCH(LDRWL, insn)) {
-                                                                               /* LDRx.W Rt, [PC, #<imm_12>] ->
-                                                                                * LDRx.W Rt, [SP, #+<imm_12>]
-                                                                                * (+/-imm_8 for LDRD Rt, Rt2, [PC, #<imm_8>] */
-                                                                               insns[2] = (insn & 0xfffffff0) | 0xd;
-                                                                       } else {
-                                                                               if (THUMB2_INSN_MATCH(RSBW, insn)) {
-                                                                                       insns[2] = (insn & 0xfffffff0) | 0xd;                                                                   /*  RSB{S}.W Rd, PC, #<const> -> RSB{S}.W Rd, SP, #<const> */
-                                                                               } else {
-                                                                                       if (THUMB2_INSN_MATCH(RORW, insn) || THUMB2_INSN_MATCH(LSLW1, insn) || THUMB2_INSN_MATCH(LSRW1, insn)) {
-                                                                                               if ((THUMB2_INSN_REG_RM(insn) == 15) && (THUMB2_INSN_REG_RN(insn) == 15))
-                                                                                                       insns[2] = (insn & 0xfffdfffd);                                                         /*  ROR.W Rd, PC, PC */
-                                                                                               else if (THUMB2_INSN_REG_RM(insn) == 15)
-                                                                                                       insns[2] = (insn & 0xfff0ffff) | 0xd0000;                                               /*  ROR.W Rd, Rn, PC */
-                                                                                               else if (THUMB2_INSN_REG_RN(insn) == 15)
-                                                                                                       insns[2] = (insn & 0xfffffff0) | 0xd;                                                   /*  ROR.W Rd, PC, Rm */
-                                                                                       } else {
-                                                                                               if (THUMB2_INSN_MATCH(ROR, insn) || THUMB2_INSN_MATCH(LSLW2, insn) || THUMB2_INSN_MATCH(LSRW2, insn))
-                                                                                                       insns[2] = (insn & 0xfff0ffff) | 0xd0000;                                               /*  ROR{S} Rd, PC, #<const> -> ROR{S} Rd, SP, #<const> */
-                                                                                       }
-                                                                               }
-                                                                       }
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
+       } else if (THUMB_INSN_MATCH(LRO3, insn)) {
+               /* LDR Rd, [PC, #immed_8*4] ->
+                * LDR Rd, [SP, #immed_8*4] */
+               *((unsigned short *)insns + 4) =
+                       ((insn & 0xffff) + 0x5000);
+       } else if (THUMB_INSN_MATCH(MOV3, insn)) {
+               /* MOV Rd, PC -> MOV Rd, SP */
+               *((unsigned short *)insns + 4) =
+                       ((insn & 0xffff) ^ 0x10);
+       } else if (THUMB2_INSN_MATCH(ADR, insn)) {
+               /* ADDW Rd,PC,#imm -> ADDW Rd,SP,#imm */
+               insns[2] = (insn & 0xfffffff0) | 0x0d;
+       } else if (THUMB2_INSN_MATCH(LDRW, insn) ||
+                  THUMB2_INSN_MATCH(LDRBW, insn) ||
+                  THUMB2_INSN_MATCH(LDRHW, insn)) {
+               /* LDR.W Rt, [PC, #-<imm_12>] ->
+                * LDR.W Rt, [SP, #-<imm_8>]
+                * !!!!!!!!!!!!!!!!!!!!!!!!
+                * !!! imm_12 vs. imm_8 !!!
+                * !!!!!!!!!!!!!!!!!!!!!!!! */
+               insns[2] = (insn & 0xf0fffff0) | 0x0c00000d;
+       } else if (THUMB2_INSN_MATCH(LDRW1, insn) ||
+                  THUMB2_INSN_MATCH(LDRBW1, insn) ||
+                  THUMB2_INSN_MATCH(LDRHW1, insn) ||
+                  THUMB2_INSN_MATCH(LDRD, insn) ||
+                  THUMB2_INSN_MATCH(LDRD1, insn) ||
+                  THUMB2_INSN_MATCH(LDREX, insn)) {
+               /* LDRx.W Rt, [PC, #+<imm_12>] ->
+                * LDRx.W Rt, [SP, #+<imm_12>]
+                (+/-imm_8 for LDRD Rt, Rt2, [PC, #<imm_8>] */
+               insns[2] = (insn & 0xfffffff0) | 0xd;
+       } else if (THUMB2_INSN_MATCH(MUL, insn)) {
+               /* MUL Rd, Rn, SP */
+               insns[2] = (insn & 0xfff0ffff) | 0x000d0000;
+       } else if (THUMB2_INSN_MATCH(DP, insn)) {
+               if (THUMB2_INSN_REG_RM(insn) == 15)
+                       /* DP Rd, Rn, PC */
+                       insns[2] = (insn & 0xfff0ffff) | 0x000d0000;
+               else if (THUMB2_INSN_REG_RN(insn) == 15)
+                       /* DP Rd, PC, Rm */
+                       insns[2] = (insn & 0xfffffff0) | 0xd;
+       } else if (THUMB2_INSN_MATCH(LDRWL, insn)) {
+               /* LDRx.W Rt, [PC, #<imm_12>] ->
+                * LDRx.W Rt, [SP, #+<imm_12>]
+                * (+/-imm_8 for LDRD Rt, Rt2, [PC, #<imm_8>] */
+               insns[2] = (insn & 0xfffffff0) | 0xd;
+       } else if (THUMB2_INSN_MATCH(RSBW, insn)) {
+               /*  RSB{S}.W Rd, PC, #<const> -> RSB{S}.W Rd, SP, #<const> */
+               insns[2] = (insn & 0xfffffff0) | 0xd;
+       } else if (THUMB2_INSN_MATCH(RORW, insn) ||
+                  THUMB2_INSN_MATCH(LSLW1, insn) ||
+                  THUMB2_INSN_MATCH(LSRW1, insn)) {
+               if ((THUMB2_INSN_REG_RM(insn) == 15) &&
+                   (THUMB2_INSN_REG_RN(insn) == 15))
+                       /*  ROR.W Rd, PC, PC */
+                       insns[2] = (insn & 0xfffdfffd);
+               else if (THUMB2_INSN_REG_RM(insn) == 15)
+                       /*  ROR.W Rd, Rn, PC */
+                       insns[2] = (insn & 0xfff0ffff) | 0xd0000;
+               else if (THUMB2_INSN_REG_RN(insn) == 15)
+                       /*  ROR.W Rd, PC, Rm */
+                       insns[2] = (insn & 0xfffffff0) | 0xd;
+       } else if (THUMB2_INSN_MATCH(ROR, insn) ||
+                  THUMB2_INSN_MATCH(LSLW2, insn) ||
+                  THUMB2_INSN_MATCH(LSRW2, insn)) {
+               /*  ROR{S} Rd, PC, #<const> -> ROR{S} Rd, SP, #<const> */
+               insns[2] = (insn & 0xfff0ffff) | 0xd0000;
        }
 
-       if (THUMB2_INSN_MATCH(STRW, insn) || THUMB2_INSN_MATCH(STRBW, insn)) {
-               insns[2] = (insn & 0xfff0ffff) | 0x000d0000;                                                            /*  STRx.W Rt, [Rn, SP] */
-       } else {
-               if (THUMB2_INSN_MATCH(STRD, insn) || THUMB2_INSN_MATCH(STRHT, insn) ||
-                   THUMB2_INSN_MATCH(STRT, insn) || THUMB2_INSN_MATCH(STRHW1, insn)) {
-                       if (THUMB2_INSN_REG_RN(insn) == 15)
-                               insns[2] = (insn & 0xfffffff0) | 0xd;                                                   /*  STRD/T/HT{.W} Rt, [SP, ...] */
-                       else
-                               insns[2] = insn;
-               } else {
-                       if (THUMB2_INSN_MATCH(STRHW, insn) && (THUMB2_INSN_REG_RN(insn) == 15)) {
-                               if (THUMB2_INSN_REG_RN(insn) == 15)
-                                       insns[2] = (insn & 0xf0fffff0) | 0x0c00000d;                                    /*  STRH.W Rt, [SP, #-<imm_8>] */
-                               else
-                                       insns[2] = insn;
-                       }
-               }
+       if (THUMB2_INSN_MATCH(STRW, insn) ||
+           THUMB2_INSN_MATCH(STRBW, insn)) {
+               /*  STRx.W Rt, [Rn, SP] */
+               insns[2] = (insn & 0xfff0ffff) | 0x000d0000;
+       } else if (THUMB2_INSN_MATCH(STRD, insn) ||
+                  THUMB2_INSN_MATCH(STRHT, insn) ||
+                  THUMB2_INSN_MATCH(STRT, insn) ||
+                  THUMB2_INSN_MATCH(STRHW1, insn)) {
+               if (THUMB2_INSN_REG_RN(insn) == 15)
+                       /*  STRD/T/HT{.W} Rt, [SP, ...] */
+                       insns[2] = (insn & 0xfffffff0) | 0xd;
+               else
+                       insns[2] = insn;
+       } else if (THUMB2_INSN_MATCH(STRHW, insn) &&
+                  (THUMB2_INSN_REG_RN(insn) == 15)) {
+               if (THUMB2_INSN_REG_RN(insn) == 15)
+                       /*  STRH.W Rt, [SP, #-<imm_8>] */
+                       insns[2] = (insn & 0xf0fffff0) | 0x0c00000d;
+               else
+                       insns[2] = insn;
        }
 
        /*  STRx PC, xxx */
@@ -392,19 +373,22 @@ static int prep_pc_dep_insn_execbuf_thumb(kprobe_opcode_t *insns,
                insns[2] = (insns[2] & 0x0fffffff) | 0xd0000000;
        }
 
-       if (THUMB2_INSN_MATCH(TEQ1, insn) || THUMB2_INSN_MATCH(TST1, insn)) {
-               insns[2] = (insn & 0xfffffff0) | 0xd;                                                                   /*  TEQ SP, #<const> */
-       } else {
-               if (THUMB2_INSN_MATCH(TEQ2, insn) ||
-                   THUMB2_INSN_MATCH(TST2, insn)) {
-                       if ((THUMB2_INSN_REG_RN(insn) == 15) &&
-                           (THUMB2_INSN_REG_RM(insn) == 15))
-                               insns[2] = (insn & 0xfffdfffd);                                                         /*  TEQ/TST PC, PC */
-                       else if (THUMB2_INSN_REG_RM(insn) == 15)
-                               insns[2] = (insn & 0xfff0ffff) | 0xd0000;                                               /*  TEQ/TST Rn, PC */
-                       else if (THUMB2_INSN_REG_RN(insn) == 15)
-                               insns[2] = (insn & 0xfffffff0) | 0xd;                                                   /*  TEQ/TST PC, Rm */
-               }
+       if (THUMB2_INSN_MATCH(TEQ1, insn) ||
+           THUMB2_INSN_MATCH(TST1, insn)) {
+               /*  TEQ SP, #<const> */
+               insns[2] = (insn & 0xfffffff0) | 0xd;
+       } else if (THUMB2_INSN_MATCH(TEQ2, insn) ||
+                  THUMB2_INSN_MATCH(TST2, insn)) {
+               if ((THUMB2_INSN_REG_RN(insn) == 15) &&
+                   (THUMB2_INSN_REG_RM(insn) == 15))
+                       /*  TEQ/TST PC, PC */
+                       insns[2] = (insn & 0xfffdfffd);
+               else if (THUMB2_INSN_REG_RM(insn) == 15)
+                       /*  TEQ/TST Rn, PC */
+                       insns[2] = (insn & 0xfff0ffff) | 0xd0000;
+               else if (THUMB2_INSN_REG_RN(insn) == 15)
+                       /*  TEQ/TST PC, Rm */
+                       insns[2] = (insn & 0xfffffff0) | 0xd;
        }
 
        return 0;

diff --git a/writer/debugfs_writer.c b/writer/debugfs_writer.c
index 1fbb706..a37cd40 100644 (file)
--- a/writer/debugfs_writer.c
+++ b/writer/debugfs_writer.c
@@ -32,7 +32,7 @@
 #include <linux/debugfs.h>
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <master/swap_debugfs.h>
 #include <master/swap_initializer.h>
 #include "swap_writer_module.h"

diff --git a/writer/kernel_operations.h b/writer/kernel_operations.h
index eb51ed7..dd07fbb 100644 (file)
--- a/writer/kernel_operations.h
+++ b/writer/kernel_operations.h
@@ -33,7 +33,7 @@
 #define __KERNEL_OPERATIONS_H__
 
 #include <linux/kernel.h>
-#include <asm/ptrace.h>
+#include <linux/ptrace.h>
 
 /* MESSAGES */
 

diff --git a/writer/kernel_operations_arm.c b/writer/kernel_operations_arm.c
index db9e434..08b9922 100644 (file)
--- a/writer/kernel_operations_arm.c
+++ b/writer/kernel_operations_arm.c
@@ -27,9 +27,8 @@
  * ARM arch-dependent operations.
  */
 
-#include <asm/ptrace.h>
-#include <asm/uaccess.h>
-#include <asm/page.h>
+#include <linux/ptrace.h>
+#include <linux/uaccess.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <generated/autoconf.h>

diff --git a/writer/kernel_operations_x86.c b/writer/kernel_operations_x86.c
index 1335ccd..d802ff0 100644 (file)
--- a/writer/kernel_operations_x86.c
+++ b/writer/kernel_operations_x86.c
@@ -27,9 +27,9 @@
  * X86 arch-dependent operations.
  */
 
-#include <asm/ptrace.h>
-#include <asm/uaccess.h>
-#include <asm/elf.h>
+#include <linux/ptrace.h>
+#include <linux/uaccess.h>
+#include <linux/elf.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/mm.h>

diff --git a/writer/swap_writer_module.c b/writer/swap_writer_module.c
index df9c006..3d63401 100644 (file)
--- a/writer/swap_writer_module.c
+++ b/writer/swap_writer_module.c
@@ -40,7 +40,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #include <master/swap_initializer.h>
 #include <buffer/swap_buffer_module.h>