---

yaml --- r: 272994 b: refs/heads/master c: ad694df h: refs/heads/master v: v3
git-mirror · Nov 2, 2011 · ac8c47f · ac8c47f
1 parent 87492e9
commit ac8c47f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 92 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 412f90ed13c86f066a4ab14ed5bcd0793ef0355d
+refs/heads/master: ad694df534568b6072baebdb784b63c6209fe1cc
diff --git a/trunk/arch/um/sys-i386/shared/sysdep/sc.h b/trunk/arch/um/sys-i386/shared/sysdep/sc.h
diff --git a/trunk/arch/um/sys-i386/shared/sysdep/sigcontext.h b/trunk/arch/um/sys-i386/shared/sysdep/sigcontext.h
@@ -6,10 +6,17 @@
 #ifndef __SYS_SIGCONTEXT_I386_H
 #define __SYS_SIGCONTEXT_I386_H
 
-#include "sysdep/sc.h"
+#include <generated/user_constants.h>
 
 #define IP_RESTART_SYSCALL(ip) ((ip) -= 2)
 
+#define SC_OFFSET(sc, field) \
+	*((unsigned long *) &(((char *) (sc))[HOST_##field]))
+
+#define SC_TRAPNO(sc) SC_OFFSET(sc, SC_TRAPNO)
+#define SC_ERR(sc) SC_OFFSET(sc, SC_ERR)
+#define SC_CR2(sc) SC_OFFSET(sc, SC_CR2)
+
 #define GET_FAULTINFO_FROM_SC(fi, sc) \
 	{ \
 		(fi).cr2 = SC_CR2(sc); \

diff --git a/trunk/arch/um/sys-x86_64/shared/sysdep/sc.h b/trunk/arch/um/sys-x86_64/shared/sysdep/sc.h
diff --git a/trunk/arch/um/sys-x86_64/shared/sysdep/sigcontext.h b/trunk/arch/um/sys-x86_64/shared/sysdep/sigcontext.h
@@ -7,7 +7,13 @@
 #ifndef __SYSDEP_X86_64_SIGCONTEXT_H
 #define __SYSDEP_X86_64_SIGCONTEXT_H
 
-#include <sysdep/sc.h>
+#include <generated/user_constants.h>
+
+#define SC_OFFSET(sc, field) \
+	 *((unsigned long *) &(((char *) (sc))[HOST_##field]))
+#define SC_CR2(sc) SC_OFFSET(sc, SC_CR2)
+#define SC_ERR(sc) SC_OFFSET(sc, SC_ERR)
+#define SC_TRAPNO(sc) SC_OFFSET(sc, SC_TRAPNO)
 
 #define IP_RESTART_SYSCALL(ip) ((ip) -= 2)