diff --git a/sys/arch/arm/arm32/cpuswitch.S b/sys/arch/arm/arm32/cpuswitch.S
index 992399153812..1de617b9844f 100644
--- a/sys/arch/arm/arm32/cpuswitch.S
+++ b/sys/arch/arm/arm32/cpuswitch.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpuswitch.S,v 1.68 2012/08/29 16:45:34 matt Exp $	*/
+/*	$NetBSD: cpuswitch.S,v 1.69 2012/08/31 11:45:38 skrll Exp $	*/
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -89,7 +89,7 @@
 #include <machine/asm.h>
 #include <machine/cpu.h>
 
-	RCSID("$NetBSD: cpuswitch.S,v 1.68 2012/08/29 16:45:34 matt Exp $")
+	RCSID("$NetBSD: cpuswitch.S,v 1.69 2012/08/31 11:45:38 skrll Exp $")
 
 /* LINTSTUB: include <sys/param.h> */
 	
@@ -352,6 +352,8 @@ ENTRY(lwp_trampoline)
 
 	movs	pc, lr			/* Exit */
 
+AST_ALIGNMENT_FAULT_LOCALS
+
 #ifdef __HAVE_FAST_SOFTINTS
 /*
  *	Called at IPL_HIGH