Index: sys/arm/linux/linux.h
===================================================================
--- sys/arm/linux/linux.h
+++ sys/arm/linux/linux.h
@@ -281,28 +281,27 @@
 
 /* The Linux sigcontext, pretty much a standard 386 trapframe. */
 struct l_sigcontext {
-	l_int		sc_gs;
-	l_int		sc_fs;
-	l_int		sc_es;
-	l_int		sc_ds;
-	l_int		sc_edi;
-	l_int		sc_esi;
-	l_int		sc_ebp;
-	l_int		sc_esp;
-	l_int		sc_ebx;
-	l_int		sc_edx;
-	l_int		sc_ecx;
-	l_int		sc_eax;
-	l_int		sc_trapno;
-	l_int		sc_err;
-	l_int		sc_eip;
-	l_int		sc_cs;
-	l_int		sc_eflags;
-	l_int		sc_esp_at_signal;
-	l_int		sc_ss;
-	l_int		sc_387;
-	l_int		sc_mask;
-	l_int		sc_cr2;
+	unsigned long	trap_no;
+	unsigned long	error_code;
+	unsigned long	oldmask;
+	unsigned long	arm_r0;
+	unsigned long	arm_r1;
+	unsigned long	arm_r2;
+	unsigned long	arm_r3;
+	unsigned long	arm_r4;
+	unsigned long	arm_r5;
+	unsigned long	arm_r6;
+	unsigned long	arm_r7;
+	unsigned long	arm_r8;
+	unsigned long	arm_r9;
+	unsigned long	arm_r10;
+	unsigned long	arm_fp;
+	unsigned long	arm_ip;
+	unsigned long	arm_sp;
+	unsigned long	arm_lr;
+	unsigned long	arm_pc;
+	unsigned long	arm_cpsr;
+	unsigned long	fault_address;
 } __packed;
 
 struct l_ucontext {
Index: sys/arm/linux/linux_genassym.c
===================================================================
--- /dev/null
+++ sys/arm/linux/linux_genassym.c
@@ -0,0 +1,18 @@
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/assym.h>
+#include <sys/systm.h>
+
+#include <arm/linux/linux.h>
+#include <compat/linux/linux_mib.h>
+
+ASSYM(LINUX_SIGF_HANDLER, offsetof(struct l_sigframe, sf_handler));
+ASSYM(LINUX_SIGF_SC, offsetof(struct l_sigframe, sf_sc));
+ASSYM(LINUX_SC_EFLAGS, offsetof(struct l_sigcontext, arm_cpsr));
+ASSYM(LINUX_RT_SIGF_HANDLER, offsetof(struct l_rt_sigframe, sf_handler));
+ASSYM(LINUX_RT_SIGF_UC, offsetof(struct l_rt_sigframe, sf_sc));
+ASSYM(LINUX_RT_SIGF_SC, offsetof(struct l_ucontext, uc_mcontext));
+ASSYM(LINUX_SC_ESP, offsetof(struct l_sigcontext, arm_sp));
+ASSYM(LINUX_VERSION_CODE, LINUX_VERSION_CODE);