diff options
Diffstat (limited to 'arch/um/sys-i386/signal.c')
| -rw-r--r-- | arch/um/sys-i386/signal.c | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/arch/um/sys-i386/signal.c b/arch/um/sys-i386/signal.c index c82e5f562ec6..1eb21a023e33 100644 --- a/arch/um/sys-i386/signal.c +++ b/arch/um/sys-i386/signal.c | |||
| @@ -14,22 +14,22 @@ void copy_sc(struct uml_pt_regs *regs, void *from) | |||
| 14 | { | 14 | { |
| 15 | struct sigcontext *sc = from; | 15 | struct sigcontext *sc = from; |
| 16 | 16 | ||
| 17 | REGS_GS(regs->regs) = sc->gs; | 17 | REGS_GS(regs->gp) = sc->gs; |
| 18 | REGS_FS(regs->regs) = sc->fs; | 18 | REGS_FS(regs->gp) = sc->fs; |
| 19 | REGS_ES(regs->regs) = sc->es; | 19 | REGS_ES(regs->gp) = sc->es; |
| 20 | REGS_DS(regs->regs) = sc->ds; | 20 | REGS_DS(regs->gp) = sc->ds; |
| 21 | REGS_EDI(regs->regs) = sc->edi; | 21 | REGS_EDI(regs->gp) = sc->edi; |
| 22 | REGS_ESI(regs->regs) = sc->esi; | 22 | REGS_ESI(regs->gp) = sc->esi; |
| 23 | REGS_EBP(regs->regs) = sc->ebp; | 23 | REGS_EBP(regs->gp) = sc->ebp; |
| 24 | REGS_SP(regs->regs) = sc->esp; | 24 | REGS_SP(regs->gp) = sc->esp; |
| 25 | REGS_EBX(regs->regs) = sc->ebx; | 25 | REGS_EBX(regs->gp) = sc->ebx; |
| 26 | REGS_EDX(regs->regs) = sc->edx; | 26 | REGS_EDX(regs->gp) = sc->edx; |
| 27 | REGS_ECX(regs->regs) = sc->ecx; | 27 | REGS_ECX(regs->gp) = sc->ecx; |
| 28 | REGS_EAX(regs->regs) = sc->eax; | 28 | REGS_EAX(regs->gp) = sc->eax; |
| 29 | REGS_IP(regs->regs) = sc->eip; | 29 | REGS_IP(regs->gp) = sc->eip; |
| 30 | REGS_CS(regs->regs) = sc->cs; | 30 | REGS_CS(regs->gp) = sc->cs; |
| 31 | REGS_EFLAGS(regs->regs) = sc->eflags; | 31 | REGS_EFLAGS(regs->gp) = sc->eflags; |
| 32 | REGS_SS(regs->regs) = sc->ss; | 32 | REGS_SS(regs->gp) = sc->ss; |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | static int copy_sc_from_user(struct pt_regs *regs, | 35 | static int copy_sc_from_user(struct pt_regs *regs, |
| @@ -65,23 +65,23 @@ static int copy_sc_to_user(struct sigcontext __user *to, | |||
| 65 | struct faultinfo * fi = ¤t->thread.arch.faultinfo; | 65 | struct faultinfo * fi = ¤t->thread.arch.faultinfo; |
| 66 | int err; | 66 | int err; |
| 67 | 67 | ||
| 68 | sc.gs = REGS_GS(regs->regs.regs); | 68 | sc.gs = REGS_GS(regs->regs.gp); |
| 69 | sc.fs = REGS_FS(regs->regs.regs); | 69 | sc.fs = REGS_FS(regs->regs.gp); |
| 70 | sc.es = REGS_ES(regs->regs.regs); | 70 | sc.es = REGS_ES(regs->regs.gp); |
| 71 | sc.ds = REGS_DS(regs->regs.regs); | 71 | sc.ds = REGS_DS(regs->regs.gp); |
| 72 | sc.edi = REGS_EDI(regs->regs.regs); | 72 | sc.edi = REGS_EDI(regs->regs.gp); |
| 73 | sc.esi = REGS_ESI(regs->regs.regs); | 73 | sc.esi = REGS_ESI(regs->regs.gp); |
| 74 | sc.ebp = REGS_EBP(regs->regs.regs); | 74 | sc.ebp = REGS_EBP(regs->regs.gp); |
| 75 | sc.esp = sp; | 75 | sc.esp = sp; |
| 76 | sc.ebx = REGS_EBX(regs->regs.regs); | 76 | sc.ebx = REGS_EBX(regs->regs.gp); |
| 77 | sc.edx = REGS_EDX(regs->regs.regs); | 77 | sc.edx = REGS_EDX(regs->regs.gp); |
| 78 | sc.ecx = REGS_ECX(regs->regs.regs); | 78 | sc.ecx = REGS_ECX(regs->regs.gp); |
| 79 | sc.eax = REGS_EAX(regs->regs.regs); | 79 | sc.eax = REGS_EAX(regs->regs.gp); |
| 80 | sc.eip = REGS_IP(regs->regs.regs); | 80 | sc.eip = REGS_IP(regs->regs.gp); |
| 81 | sc.cs = REGS_CS(regs->regs.regs); | 81 | sc.cs = REGS_CS(regs->regs.gp); |
| 82 | sc.eflags = REGS_EFLAGS(regs->regs.regs); | 82 | sc.eflags = REGS_EFLAGS(regs->regs.gp); |
| 83 | sc.esp_at_signal = regs->regs.regs[UESP]; | 83 | sc.esp_at_signal = regs->regs.gp[UESP]; |
| 84 | sc.ss = regs->regs.regs[SS]; | 84 | sc.ss = regs->regs.gp[SS]; |
| 85 | sc.cr2 = fi->cr2; | 85 | sc.cr2 = fi->cr2; |
| 86 | sc.err = fi->error_code; | 86 | sc.err = fi->error_code; |
| 87 | sc.trapno = fi->trap_no; | 87 | sc.trapno = fi->trap_no; |