projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
[powerpc.git]
/
include
/
asm-x86
/
sigcontext.h
diff --git
a/include/asm-x86/sigcontext.h
b/include/asm-x86/sigcontext.h
index
c047f9d
..
681dead
100644
(file)
--- a/
include/asm-x86/sigcontext.h
+++ b/
include/asm-x86/sigcontext.h
@@
-63,20
+63,20
@@
struct sigcontext {
unsigned short fs, __fsh;
unsigned short es, __esh;
unsigned short ds, __dsh;
unsigned short fs, __fsh;
unsigned short es, __esh;
unsigned short ds, __dsh;
- unsigned long
e
di;
- unsigned long
e
si;
- unsigned long
e
bp;
- unsigned long
e
sp;
- unsigned long
e
bx;
- unsigned long
e
dx;
- unsigned long
e
cx;
- unsigned long
e
ax;
+ unsigned long di;
+ unsigned long si;
+ unsigned long bp;
+ unsigned long sp;
+ unsigned long bx;
+ unsigned long dx;
+ unsigned long cx;
+ unsigned long ax;
unsigned long trapno;
unsigned long err;
unsigned long trapno;
unsigned long err;
- unsigned long
e
ip;
+ unsigned long ip;
unsigned short cs, __csh;
unsigned short cs, __csh;
- unsigned long
e
flags;
- unsigned long
e
sp_at_signal;
+ unsigned long flags;
+ unsigned long sp_at_signal;
unsigned short ss, __ssh;
struct _fpstate __user * fpstate;
unsigned long oldmask;
unsigned short ss, __ssh;
struct _fpstate __user * fpstate;
unsigned long oldmask;
@@
-111,16
+111,16
@@
struct sigcontext {
unsigned long r13;
unsigned long r14;
unsigned long r15;
unsigned long r13;
unsigned long r14;
unsigned long r15;
- unsigned long
r
di;
- unsigned long
r
si;
- unsigned long
r
bp;
- unsigned long
r
bx;
- unsigned long
r
dx;
- unsigned long
r
ax;
- unsigned long
r
cx;
- unsigned long
r
sp;
- unsigned long
r
ip;
- unsigned long
eflags; /* RFLAGS */
+ unsigned long di;
+ unsigned long si;
+ unsigned long bp;
+ unsigned long bx;
+ unsigned long dx;
+ unsigned long ax;
+ unsigned long cx;
+ unsigned long sp;
+ unsigned long ip;
+ unsigned long
flags;
unsigned short cs;
unsigned short gs;
unsigned short fs;
unsigned short cs;
unsigned short gs;
unsigned short fs;