summaryrefslogtreecommitdiff
path: root/sys/arch/arm/include
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/arm/include')
-rw-r--r--sys/arch/arm/include/cpu.h3
-rw-r--r--sys/arch/arm/include/signal.h4
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/arm/include/cpu.h b/sys/arch/arm/include/cpu.h
index b9260fd852f..155a2a2a57e 100644
--- a/sys/arch/arm/include/cpu.h
+++ b/sys/arch/arm/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.30 2011/11/16 20:50:18 deraadt Exp $ */
+/* $OpenBSD: cpu.h,v 1.31 2012/12/02 07:03:31 guenther Exp $ */
/* $NetBSD: cpu.h,v 1.34 2003/06/23 11:01:08 martin Exp $ */
/*
@@ -154,6 +154,7 @@ extern int current_intr_depth;
* PROC_PC: Find out the program counter for the given process.
*/
#define PROC_PC(p) ((p)->p_addr->u_pcb.pcb_tf->tf_pc)
+#define PROC_STACK(p) ((p)->p_addr->u_pcb.pcb_tf->tf_usr_sp)
/* The address of the vector page. */
extern vaddr_t vector_page;
diff --git a/sys/arch/arm/include/signal.h b/sys/arch/arm/include/signal.h
index 5af8396e380..564ea4f5bfc 100644
--- a/sys/arch/arm/include/signal.h
+++ b/sys/arch/arm/include/signal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: signal.h,v 1.7 2011/09/20 22:02:13 miod Exp $ */
+/* $OpenBSD: signal.h,v 1.8 2012/12/02 07:03:31 guenther Exp $ */
/* $NetBSD: signal.h,v 1.5 2003/10/18 17:57:21 briggs Exp $ */
/*
@@ -61,7 +61,7 @@ typedef int sig_atomic_t;
* a non-standard exit is performed.
*/
struct sigcontext {
- int sc_onstack; /* sigstack state to restore */
+ int __sc_unused;
int sc_mask; /* signal mask to restore (old style) */
unsigned int sc_spsr;