aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/sys-i386
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2008-01-30 07:31:08 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:31:08 -0500
commit7796931f542518092d1fd2fb7cf1f1d96e0cd4b5 (patch)
tree1daf33db62ed441347ba72dab8474b4bbf4b333b /arch/um/sys-i386
parentd46d7d754014a299fa9b3400d080e09bfe4d629f (diff)
UML: change sigcontext fields to match x86
git-x86, in commit 70aa1bd3839e3ec74ce65316528a82570e8de666, changed a lot of the sigcontext field names. This patch changes UML usage to match. I also changed includes of generic headers from "" to <>. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/um/sys-i386')
-rw-r--r--arch/um/sys-i386/signal.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/arch/um/sys-i386/signal.c b/arch/um/sys-i386/signal.c
index 0147227ce18d..19053d46cb60 100644
--- a/arch/um/sys-i386/signal.c
+++ b/arch/um/sys-i386/signal.c
@@ -3,10 +3,10 @@
3 * Licensed under the GPL 3 * Licensed under the GPL
4 */ 4 */
5 5
6#include "linux/ptrace.h" 6#include <linux/ptrace.h>
7#include "asm/unistd.h" 7#include <asm/unistd.h>
8#include "asm/uaccess.h" 8#include <asm/uaccess.h>
9#include "asm/ucontext.h" 9#include <asm/ucontext.h>
10#include "frame_kern.h" 10#include "frame_kern.h"
11#include "skas.h" 11#include "skas.h"
12 12
@@ -18,17 +18,17 @@ void copy_sc(struct uml_pt_regs *regs, void *from)
18 REGS_FS(regs->gp) = sc->fs; 18 REGS_FS(regs->gp) = sc->fs;
19 REGS_ES(regs->gp) = sc->es; 19 REGS_ES(regs->gp) = sc->es;
20 REGS_DS(regs->gp) = sc->ds; 20 REGS_DS(regs->gp) = sc->ds;
21 REGS_EDI(regs->gp) = sc->edi; 21 REGS_EDI(regs->gp) = sc->di;
22 REGS_ESI(regs->gp) = sc->esi; 22 REGS_ESI(regs->gp) = sc->si;
23 REGS_EBP(regs->gp) = sc->ebp; 23 REGS_EBP(regs->gp) = sc->bp;
24 REGS_SP(regs->gp) = sc->esp; 24 REGS_SP(regs->gp) = sc->sp;
25 REGS_EBX(regs->gp) = sc->ebx; 25 REGS_EBX(regs->gp) = sc->bx;
26 REGS_EDX(regs->gp) = sc->edx; 26 REGS_EDX(regs->gp) = sc->dx;
27 REGS_ECX(regs->gp) = sc->ecx; 27 REGS_ECX(regs->gp) = sc->cx;
28 REGS_EAX(regs->gp) = sc->eax; 28 REGS_EAX(regs->gp) = sc->ax;
29 REGS_IP(regs->gp) = sc->eip; 29 REGS_IP(regs->gp) = sc->ip;
30 REGS_CS(regs->gp) = sc->cs; 30 REGS_CS(regs->gp) = sc->cs;
31 REGS_EFLAGS(regs->gp) = sc->eflags; 31 REGS_EFLAGS(regs->gp) = sc->flags;
32 REGS_SS(regs->gp) = sc->ss; 32 REGS_SS(regs->gp) = sc->ss;
33} 33}
34 34
@@ -229,18 +229,18 @@ static int copy_sc_to_user(struct sigcontext __user *to,
229 sc.fs = REGS_FS(regs->regs.gp); 229 sc.fs = REGS_FS(regs->regs.gp);
230 sc.es = REGS_ES(regs->regs.gp); 230 sc.es = REGS_ES(regs->regs.gp);
231 sc.ds = REGS_DS(regs->regs.gp); 231 sc.ds = REGS_DS(regs->regs.gp);
232 sc.edi = REGS_EDI(regs->regs.gp); 232 sc.di = REGS_EDI(regs->regs.gp);
233 sc.esi = REGS_ESI(regs->regs.gp); 233 sc.si = REGS_ESI(regs->regs.gp);
234 sc.ebp = REGS_EBP(regs->regs.gp); 234 sc.bp = REGS_EBP(regs->regs.gp);
235 sc.esp = sp; 235 sc.sp = sp;
236 sc.ebx = REGS_EBX(regs->regs.gp); 236 sc.bx = REGS_EBX(regs->regs.gp);
237 sc.edx = REGS_EDX(regs->regs.gp); 237 sc.dx = REGS_EDX(regs->regs.gp);
238 sc.ecx = REGS_ECX(regs->regs.gp); 238 sc.cx = REGS_ECX(regs->regs.gp);
239 sc.eax = REGS_EAX(regs->regs.gp); 239 sc.ax = REGS_EAX(regs->regs.gp);
240 sc.eip = REGS_IP(regs->regs.gp); 240 sc.ip = REGS_IP(regs->regs.gp);
241 sc.cs = REGS_CS(regs->regs.gp); 241 sc.cs = REGS_CS(regs->regs.gp);
242 sc.eflags = REGS_EFLAGS(regs->regs.gp); 242 sc.flags = REGS_EFLAGS(regs->regs.gp);
243 sc.esp_at_signal = regs->regs.gp[UESP]; 243 sc.sp_at_signal = regs->regs.gp[UESP];
244 sc.ss = regs->regs.gp[SS]; 244 sc.ss = regs->regs.gp[SS];
245 sc.cr2 = fi->cr2; 245 sc.cr2 = fi->cr2;
246 sc.err = fi->error_code; 246 sc.err = fi->error_code;