Commit 18b8e08e authored by David S. Miller's avatar David S. Miller

sparc64: Work around branch tracer warning.

As reported by Sam Ravnborg, Gcc-3.4.5 does not handle:

	if (get_user() || get_user())

with the new branch tracer enabled.

Just seperate it out into seperate statements for now
so people can get work done.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3f4528d6
...@@ -601,11 +601,15 @@ void handle_lddfmna(struct pt_regs *regs, unsigned long sfar, unsigned long sfsr ...@@ -601,11 +601,15 @@ void handle_lddfmna(struct pt_regs *regs, unsigned long sfar, unsigned long sfsr
pc = (u32)pc; pc = (u32)pc;
if (get_user(insn, (u32 __user *) pc) != -EFAULT) { if (get_user(insn, (u32 __user *) pc) != -EFAULT) {
int asi = decode_asi(insn, regs); int asi = decode_asi(insn, regs);
int err;
if ((asi > ASI_SNFL) || if ((asi > ASI_SNFL) ||
(asi < ASI_P)) (asi < ASI_P))
goto daex; goto daex;
if (get_user(first, (u32 __user *)sfar) || err = get_user(first, (u32 __user *)sfar);
get_user(second, (u32 __user *)(sfar + 4))) { if (!err)
err = get_user(second, (u32 __user *)(sfar + 4));
if (err) {
if (asi & 0x2) /* NF */ { if (asi & 0x2) /* NF */ {
first = 0; second = 0; first = 0; second = 0;
} else } else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment