summaryrefslogtreecommitdiffstats
path: root/sys/amd64/include
diff options
context:
space:
mode:
Diffstat (limited to 'sys/amd64/include')
-rw-r--r--sys/amd64/include/signal.h4
-rw-r--r--sys/amd64/include/ucontext.h13
2 files changed, 5 insertions, 12 deletions
diff --git a/sys/amd64/include/signal.h b/sys/amd64/include/signal.h
index 29a9776..efc7ef0 100644
--- a/sys/amd64/include/signal.h
+++ b/sys/amd64/include/signal.h
@@ -119,7 +119,7 @@ struct sigcontext {
int sc_efl;
int sc_esp;
int sc_ss;
- int sc_len; /* sizeof(struct mcontext_t) */
+ int sc_len; /* sizeof(mcontext_t) */
/*
* XXX - See <machine/ucontext.h> and <machine/npx.h> for
* the following fields.
@@ -127,7 +127,7 @@ struct sigcontext {
int sc_fpformat;
int sc_ownedfp;
int sc_spare1[1];
- int sc_fpregs[128];
+ int sc_fpstate[128];
int sc_spare2[8];
};
diff --git a/sys/amd64/include/ucontext.h b/sys/amd64/include/ucontext.h
index af9b4fd..ea6f0b6 100644
--- a/sys/amd64/include/ucontext.h
+++ b/sys/amd64/include/ucontext.h
@@ -38,7 +38,7 @@ typedef struct __mcontext {
* and ucontext_t at the same time.
*/
int mc_onstack; /* XXX - sigcontext compat. */
- int mc_gs;
+ int mc_gs; /* machine state (trapframe) */
int mc_fs;
int mc_es;
int mc_ds;
@@ -55,7 +55,7 @@ typedef struct __mcontext {
int mc_eip;
int mc_cs;
int mc_eflags;
- int mc_esp; /* machine state */
+ int mc_esp;
int mc_ss;
int mc_len; /* sizeof(mcontext_t) */
@@ -72,8 +72,7 @@ typedef struct __mcontext {
int mc_spare2[8];
} mcontext_t;
-#ifdef _KERNEL
-#ifdef COMPAT_FREEBSD4
+#if defined(_KERNEL) && defined(COMPAT_FREEBSD4)
/* For 4.x binaries */
struct mcontext4 {
int mc_onstack; /* XXX - sigcontext compat. */
@@ -101,10 +100,4 @@ struct mcontext4 {
};
#endif
-struct thread;
-
-void get_mcontext(struct thread *td, mcontext_t *mcp);
-int set_mcontext(struct thread *td, const mcontext_t *mcp);
-#endif
-
#endif /* !_MACHINE_UCONTEXT_H_ */
OpenPOWER on IntegriCloud