]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
sparc: Most unaligned_64.c tweaks for branch tracer warnings.
authorDavid S. Miller <davem@davemloft.net>
Fri, 9 Jan 2009 00:52:36 +0000 (16:52 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 9 Jan 2009 00:52:36 +0000 (16:52 -0800)
arch/sparc/kernel/unaligned_64.c: In function 'handle_lddfmna':
arch/sparc/kernel/unaligned_64.c:592: warning: 'second' may be used uninitialized in this function

Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc/kernel/unaligned_64.c

index f164d5a850f98b90a469b24e29cbaaae64f31525..379209982a07f41ca7454332e41b9ee303263b8c 100644 (file)
@@ -589,7 +589,6 @@ void handle_lddfmna(struct pt_regs *regs, unsigned long sfar, unsigned long sfsr
        unsigned long pc = regs->tpc;
        unsigned long tstate = regs->tstate;
        u32 insn;
-       u32 first, second;
        u64 value;
        u8 freg;
        int flag;
@@ -601,19 +600,20 @@ void handle_lddfmna(struct pt_regs *regs, unsigned long sfar, unsigned long sfsr
                pc = (u32)pc;
        if (get_user(insn, (u32 __user *) pc) != -EFAULT) {
                int asi = decode_asi(insn, regs);
+               u32 first, second;
                int err;
 
                if ((asi > ASI_SNFL) ||
                    (asi < ASI_P))
                        goto daex;
+               first = second = 0;
                err = get_user(first, (u32 __user *)sfar);
                if (!err)
                        err = get_user(second, (u32 __user *)(sfar + 4));
                if (err) {
-                       if (asi & 0x2) /* NF */ {
-                               first = 0; second = 0;
-                       } else
+                       if (!(asi & 0x2))
                                goto daex;
+                       first = second = 0;
                }
                save_and_clear_fpu();
                freg = ((insn >> 25) & 0x1e) | ((insn >> 20) & 0x20);