]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - arch/sparc/kernel/unaligned_64.c
sparc64: Work around branch tracer warning.
[linux-2.6.git] / arch / sparc / kernel / unaligned_64.c
index 203ddfad9f27f3c6067760916085624503eee9ff..f164d5a850f98b90a469b24e29cbaaae64f31525 100644 (file)
@@ -601,11 +601,15 @@ 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);
+               int err;
+
                if ((asi > ASI_SNFL) ||
                    (asi < ASI_P))
                        goto daex;
-               if (get_user(first, (u32 __user *)sfar) ||
-                    get_user(second, (u32 __user *)(sfar + 4))) {
+               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