git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
m68k
/
kernel
/
signal.c
diff --git
a/arch/m68k/kernel/signal.c
b/arch/m68k/kernel/signal.c
index
0fd62ab
..
c37c4db
100644
(file)
--- a/
arch/m68k/kernel/signal.c
+++ b/
arch/m68k/kernel/signal.c
@@
-228,8
+228,8
@@
static inline int restore_fpu_state(struct sigcontext *sc)
goto out;
__asm__ volatile (".chip 68k/68881\n\t"
goto out;
__asm__ volatile (".chip 68k/68881\n\t"
- "fmovemx %0,%
/fp0-%/
fp1\n\t"
- "fmoveml %1,%
/fpcr/%/fpsr/%/
fpiar\n\t"
+ "fmovemx %0,%
%fp0-%%
fp1\n\t"
+ "fmoveml %1,%
%fpcr/%%fpsr/%%
fpiar\n\t"
".chip 68k"
: /* no outputs */
: "m" (*sc->sc_fpregs), "m" (*sc->sc_fpcntl));
".chip 68k"
: /* no outputs */
: "m" (*sc->sc_fpregs), "m" (*sc->sc_fpcntl));
@@
-258,7
+258,7
@@
static inline int rt_restore_fpu_state(struct ucontext *uc)
if (FPU_IS_EMU) {
/* restore fpu control register */
if (__copy_from_user(current->thread.fpcntl,
if (FPU_IS_EMU) {
/* restore fpu control register */
if (__copy_from_user(current->thread.fpcntl,
-
&uc->uc_mcontext.fpregs.f_pcr
, 12))
+
uc->uc_mcontext.fpregs.f_fpcntl
, 12))
goto out;
/* restore all other fpu register */
if (__copy_from_user(current->thread.fp,
goto out;
/* restore all other fpu register */
if (__copy_from_user(current->thread.fp,
@@
-298,12
+298,12
@@
static inline int rt_restore_fpu_state(struct ucontext *uc)
sizeof(fpregs)))
goto out;
__asm__ volatile (".chip 68k/68881\n\t"
sizeof(fpregs)))
goto out;
__asm__ volatile (".chip 68k/68881\n\t"
- "fmovemx %0,%
/fp0-%/
fp7\n\t"
- "fmoveml %1,%
/fpcr/%/fpsr/%/
fpiar\n\t"
+ "fmovemx %0,%
%fp0-%%
fp7\n\t"
+ "fmoveml %1,%
%fpcr/%%fpsr/%%
fpiar\n\t"
".chip 68k"
: /* no outputs */
: "m" (*fpregs.f_fpregs),
".chip 68k"
: /* no outputs */
: "m" (*fpregs.f_fpregs),
- "m" (
fpregs.f_pcr
));
+ "m" (
*fpregs.f_fpcntl
));
}
if (context_size &&
__copy_from_user(fpstate + 4, (long *)&uc->uc_fpstate + 1,
}
if (context_size &&
__copy_from_user(fpstate + 4, (long *)&uc->uc_fpstate + 1,
@@
-349,7
+349,7
@@
restore_sigcontext(struct pt_regs *regs, struct sigcontext *usc, void *fp,
/*
* user process trying to return with weird frame format
*/
/*
* user process trying to return with weird frame format
*/
-#if DEBUG
+#if
def
DEBUG
printk("user process returning with weird frame format\n");
#endif
goto badframe;
printk("user process returning with weird frame format\n");
#endif
goto badframe;
@@
-450,7
+450,7
@@
rt_restore_ucontext(struct pt_regs *regs, struct switch_stack *sw,
/*
* user process trying to return with weird frame format
*/
/*
* user process trying to return with weird frame format
*/
-#if DEBUG
+#if
def
DEBUG
printk("user process returning with weird frame format\n");
#endif
goto badframe;
printk("user process returning with weird frame format\n");
#endif
goto badframe;
@@
-586,12
+586,12
@@
static inline void save_fpu_state(struct sigcontext *sc, struct pt_regs *regs)
sc->sc_fpstate[0x38] |= 1 << 3;
}
__asm__ volatile (".chip 68k/68881\n\t"
sc->sc_fpstate[0x38] |= 1 << 3;
}
__asm__ volatile (".chip 68k/68881\n\t"
- "fmovemx %
/fp0-%/
fp1,%0\n\t"
- "fmoveml %
/fpcr/%/fpsr/%/
fpiar,%1\n\t"
+ "fmovemx %
%fp0-%%
fp1,%0\n\t"
+ "fmoveml %
%fpcr/%%fpsr/%%
fpiar,%1\n\t"
".chip 68k"
".chip 68k"
- :
/* no outputs */
- : "m" (*sc->sc_fpregs),
- "m" (*sc->sc_fpcntl)
+ :
"=m" (*sc->sc_fpregs),
+ "=m" (*sc->sc_fpcntl)
+ : /* no inputs */
: "memory");
}
}
: "memory");
}
}
@@
-604,7
+604,7
@@
static inline int rt_save_fpu_state(struct ucontext *uc, struct pt_regs *regs)
if (FPU_IS_EMU) {
/* save fpu control register */
if (FPU_IS_EMU) {
/* save fpu control register */
- err |= copy_to_user(
&uc->uc_mcontext.fpregs.f_pcr
,
+ err |= copy_to_user(
uc->uc_mcontext.fpregs.f_fpcntl
,
current->thread.fpcntl, 12);
/* save all other fpu register */
err |= copy_to_user(uc->uc_mcontext.fpregs.f_fpregs,
current->thread.fpcntl, 12);
/* save all other fpu register */
err |= copy_to_user(uc->uc_mcontext.fpregs.f_fpregs,
@@
-631,12
+631,12
@@
static inline int rt_save_fpu_state(struct ucontext *uc, struct pt_regs *regs)
fpstate[0x38] |= 1 << 3;
}
__asm__ volatile (".chip 68k/68881\n\t"
fpstate[0x38] |= 1 << 3;
}
__asm__ volatile (".chip 68k/68881\n\t"
- "fmovemx %
/fp0-%/
fp7,%0\n\t"
- "fmoveml %
/fpcr/%/fpsr/%/
fpiar,%1\n\t"
+ "fmovemx %
%fp0-%%
fp7,%0\n\t"
+ "fmoveml %
%fpcr/%%fpsr/%%
fpiar,%1\n\t"
".chip 68k"
".chip 68k"
- :
/* no outputs */
- : "m" (*fpregs.f_fpregs),
- "m" (fpregs.f_pcr)
+ :
"=m" (*fpregs.f_fpregs),
+ "=m" (*fpregs.f_fpcntl)
+ : /* no inputs */
: "memory");
err |= copy_to_user(&uc->uc_mcontext.fpregs, &fpregs,
sizeof(fpregs));
: "memory");
err |= copy_to_user(&uc->uc_mcontext.fpregs, &fpregs,
sizeof(fpregs));
@@
-829,7
+829,7
@@
adjust_stack:
if (regs->stkadj) {
struct pt_regs *tregs =
(struct pt_regs *)((ulong)regs + regs->stkadj);
if (regs->stkadj) {
struct pt_regs *tregs =
(struct pt_regs *)((ulong)regs + regs->stkadj);
-#if DEBUG
+#if
def
DEBUG
printk("Performing stackadjust=%04x\n", regs->stkadj);
#endif
/* This must be copied with decreasing addresses to
printk("Performing stackadjust=%04x\n", regs->stkadj);
#endif
/* This must be copied with decreasing addresses to
@@
-912,7
+912,7
@@
adjust_stack:
if (regs->stkadj) {
struct pt_regs *tregs =
(struct pt_regs *)((ulong)regs + regs->stkadj);
if (regs->stkadj) {
struct pt_regs *tregs =
(struct pt_regs *)((ulong)regs + regs->stkadj);
-#if DEBUG
+#if
def
DEBUG
printk("Performing stackadjust=%04x\n", regs->stkadj);
#endif
/* This must be copied with decreasing addresses to
printk("Performing stackadjust=%04x\n", regs->stkadj);
#endif
/* This must be copied with decreasing addresses to