mirror of
https://github.com/torvalds/linux.git
synced 2024-11-16 09:02:00 +00:00
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: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
3f4528d6e9
commit
18b8e08e29
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user