diff options
author | Keith Packard | 2011-06-21 21:02:57 +0200 |
---|---|---|
committer | Keith Packard | 2011-06-21 21:02:57 +0200 |
commit | 2cd1176bd9e92924242e779dcc5c8fc922f96659 (patch) | |
tree | e9daa254647af2e7d9f99694e19976df0ea2a14d /arch/sparc/kernel/visemul.c | |
parent | drm/i915: Use the LLC mode on gen6 for everything but display. (diff) | |
parent | Revert "drm/i915: Kill GTT mappings when moving from GTT domain" (diff) | |
download | kernel-qcow2-linux-2cd1176bd9e92924242e779dcc5c8fc922f96659.tar.gz kernel-qcow2-linux-2cd1176bd9e92924242e779dcc5c8fc922f96659.tar.xz kernel-qcow2-linux-2cd1176bd9e92924242e779dcc5c8fc922f96659.zip |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'arch/sparc/kernel/visemul.c')
-rw-r--r-- | arch/sparc/kernel/visemul.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/sparc/kernel/visemul.c b/arch/sparc/kernel/visemul.c index 9dfd2ebcb157..36357717d691 100644 --- a/arch/sparc/kernel/visemul.c +++ b/arch/sparc/kernel/visemul.c @@ -334,7 +334,7 @@ static void edge(struct pt_regs *regs, unsigned int insn, unsigned int opf) left = edge32_tab_l[(rs1 >> 2) & 0x1].left; right = edge32_tab_l[(rs2 >> 2) & 0x1].right; break; - }; + } if ((rs1 & ~0x7UL) == (rs2 & ~0x7UL)) rd_val = right & left; @@ -360,7 +360,7 @@ static void edge(struct pt_regs *regs, unsigned int insn, unsigned int opf) tstate = regs->tstate & ~(TSTATE_XCC | TSTATE_ICC); regs->tstate = tstate | (ccr << 32UL); } - }; + } } static void array(struct pt_regs *regs, unsigned int insn, unsigned int opf) @@ -392,7 +392,7 @@ static void array(struct pt_regs *regs, unsigned int insn, unsigned int opf) case ARRAY32_OPF: rd_val <<= 2; - }; + } store_reg(regs, rd_val, RD(insn)); } @@ -577,7 +577,7 @@ static void pformat(struct pt_regs *regs, unsigned int insn, unsigned int opf) *fpd_regaddr(f, RD(insn)) = rd_val; break; } - }; + } } static void pmul(struct pt_regs *regs, unsigned int insn, unsigned int opf) @@ -693,7 +693,7 @@ static void pmul(struct pt_regs *regs, unsigned int insn, unsigned int opf) *fpd_regaddr(f, RD(insn)) = rd_val; break; } - }; + } } static void pcmp(struct pt_regs *regs, unsigned int insn, unsigned int opf) @@ -786,7 +786,7 @@ static void pcmp(struct pt_regs *regs, unsigned int insn, unsigned int opf) rd_val |= 1 << i; } break; - }; + } maybe_flush_windows(0, 0, RD(insn), 0); store_reg(regs, rd_val, RD(insn)); @@ -885,7 +885,7 @@ int vis_emul(struct pt_regs *regs, unsigned int insn) case BSHUFFLE_OPF: bshuffle(regs, insn); break; - }; + } regs->tpc = regs->tnpc; regs->tnpc += 4; |