---

yaml --- r: 139973 b: refs/heads/master c: 872065e h: refs/heads/master i: 139971: b28b8a9 v: v3
git-mirror · Mar 24, 2009 · 7d11705 · 7d11705
1 parent 7fb64d5
commit 7d11705
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 67 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4330e179a96bc9310d36e9b858bc8f275f329312
+refs/heads/master: 872065e78c0dff5a384128ea198b34f72e9d5c3a
diff --git a/trunk/arch/m68k/include/asm/ucontext.h b/trunk/arch/m68k/include/asm/ucontext.h
@@ -1,5 +1,30 @@
-#ifdef __uClinux__
-#include "ucontext_no.h"
-#else
-#include "ucontext_mm.h"
+#ifndef _M68K_UCONTEXT_H
+#define _M68K_UCONTEXT_H
+
+typedef int greg_t;
+#define NGREG 18
+typedef greg_t gregset_t[NGREG];
+
+typedef struct fpregset {
+	int f_fpcntl[3];
+	int f_fpregs[8*3];
+} fpregset_t;
+
+struct mcontext {
+	int version;
+	gregset_t gregs;
+	fpregset_t fpregs;
+};
+
+#define MCONTEXT_VERSION 2
+
+struct ucontext {
+	unsigned long	  uc_flags;
+	struct ucontext  *uc_link;
+	stack_t		  uc_stack;
+	struct mcontext	  uc_mcontext;
+	unsigned long	  uc_filler[80];
+	sigset_t	  uc_sigmask;	/* mask last for extensibility */
+};
+
 #endif
diff --git a/trunk/arch/m68k/include/asm/ucontext_mm.h b/trunk/arch/m68k/include/asm/ucontext_mm.h
diff --git a/trunk/arch/m68k/include/asm/ucontext_no.h b/trunk/arch/m68k/include/asm/ucontext_no.h