diff --git a/[refs] b/[refs]
index d881bc969005..2cac9dbc9fa0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46acb55b4b745256a33b2eaeb6d21fffdb091745
+refs/heads/master: 02f99d1ca70d190ce12d040971819be22ea710c8
diff --git a/trunk/include/asm-avr32/asm.h b/trunk/include/asm-avr32/asm.h
index 515c7618952b..a2c64f404b98 100644
--- a/trunk/include/asm-avr32/asm.h
+++ b/trunk/include/asm-avr32/asm.h
@@ -12,10 +12,10 @@
 #include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 
-#define mask_interrupts		ssrf	SR_GM_BIT
-#define mask_exceptions		ssrf	SR_EM_BIT
-#define unmask_interrupts	csrf	SR_GM_BIT
-#define unmask_exceptions	csrf	SR_EM_BIT
+#define mask_interrupts		ssrf	SYSREG_GM_OFFSET
+#define mask_exceptions		ssrf	SYSREG_EM_OFFSET
+#define unmask_interrupts	csrf	SYSREG_GM_OFFSET
+#define unmask_exceptions	csrf	SYSREG_EM_OFFSET
 
 #ifdef CONFIG_FRAME_POINTER
 	.macro	save_fp