Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-block.git] / arch / nds32 / mm / alignment.c

diff --git a/arch/nds32/mm/alignment.c b/arch/nds32/mm/alignment.c
index b96a01b10ca7fca9a538f535bf50073cfb5c78a8..e1aed9dc692dd3bac752720a82880de865e7cb2d 100644 (file)
--- a/arch/nds32/mm/alignment.c
+++ b/arch/nds32/mm/alignment.c
@@ -19,7 +19,7 @@
 #define RA(inst)       (((inst) >> 15) & 0x1FUL)
 #define RB(inst)       (((inst) >> 10) & 0x1FUL)
 #define SV(inst)       (((inst) >> 8) & 0x3UL)
-#define IMM(inst)      (((inst) >> 0) & 0x3FFFUL)
+#define IMM(inst)      (((inst) >> 0) & 0x7FFFUL)
 
 #define RA3(inst)      (((inst) >> 3) & 0x7UL)
 #define RT3(inst)      (((inst) >> 6) & 0x7UL)
@@ -28,6 +28,9 @@
 #define RA5(inst)      (((inst) >> 0) & 0x1FUL)
 #define RT4(inst)      (((inst) >> 5) & 0xFUL)
 
+#define GET_IMMSVAL(imm_value) \
+       (((imm_value >> 14) & 0x1) ? (imm_value - 0x8000) : imm_value)
+
 #define __get8_data(val,addr,err)      \
        __asm__(                                        \
        "1:     lbi.bi  %1, [%2], #1\n"                 \
@@ -467,7 +470,7 @@ static inline int do_32(unsigned long inst, struct pt_regs *regs)
        }
 
        if (imm)
-               shift = IMM(inst) * len;
+               shift = GET_IMMSVAL(IMM(inst)) * len;
        else
                shift = *idx_to_addr(regs, RB(inst)) << SV(inst);
 
@@ -552,7 +555,7 @@ static struct ctl_table alignment_tbl[3] = {
 
 static struct ctl_table nds32_sysctl_table[2] = {
        {
-        .procname = "unaligned_acess",
+        .procname = "unaligned_access",
         .mode = 0555,
         .child = alignment_tbl},
        {}