Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/sparc/kernel/unaligned_64.c

+6 −2
Original line number Diff line number Diff line
@@ -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