git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /usr/src/ntfs-2.6/
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
kernel
/
signal32.c
diff --git
a/arch/mips/kernel/signal32.c
b/arch/mips/kernel/signal32.c
index c856dbc52abbe68d7a9434ac202c78696548b238..98b185bbc947c0576851787a78836927f5b9d65e 100644
(file)
--- a/
arch/mips/kernel/signal32.c
+++ b/
arch/mips/kernel/signal32.c
@@
-588,7
+588,7
@@
static inline int setup_sigcontext32(struct pt_regs *regs,
err |= __put_user(regs->hi, &sc->sc_mdhi);
err |= __put_user(regs->lo, &sc->sc_mdlo);
if (cpu_has_dsp) {
err |= __put_user(regs->hi, &sc->sc_mdhi);
err |= __put_user(regs->lo, &sc->sc_mdlo);
if (cpu_has_dsp) {
- err |= __put_user(rddsp(DSP_MASK), &sc->sc_
hi1
);
+ err |= __put_user(rddsp(DSP_MASK), &sc->sc_
dsp
);
err |= __put_user(mfhi1(), &sc->sc_hi1);
err |= __put_user(mflo1(), &sc->sc_lo1);
err |= __put_user(mfhi2(), &sc->sc_hi2);
err |= __put_user(mfhi1(), &sc->sc_hi1);
err |= __put_user(mflo1(), &sc->sc_lo1);
err |= __put_user(mfhi2(), &sc->sc_hi2);