diff --git a/[refs] b/[refs]
index 92642ff31d2d..382cc1f337c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 557d7d4e294ee6fb1db0cb6c1ec97a1c908b880d
+refs/heads/master: 70f1bba4c8ff88d7fd9e06f1b2cb2b3c58e8e5f9
diff --git a/trunk/include/asm-x86/dwarf2_64.h b/trunk/include/asm-x86/dwarf2_64.h
index c950519a264d..47776f461e56 100644
--- a/trunk/include/asm-x86/dwarf2_64.h
+++ b/trunk/include/asm-x86/dwarf2_64.h
@@ -35,21 +35,23 @@
 
 #else
 
-/* use assembler line comment character # to ignore the arguments. */
-#define CFI_STARTPROC	#
-#define CFI_ENDPROC	#
-#define CFI_DEF_CFA	#
-#define CFI_DEF_CFA_REGISTER	#
-#define CFI_DEF_CFA_OFFSET	#
-#define CFI_ADJUST_CFA_OFFSET	#
-#define CFI_OFFSET	#
-#define CFI_REL_OFFSET	#
-#define CFI_REGISTER	#
-#define CFI_RESTORE	#
-#define CFI_REMEMBER_STATE	#
-#define CFI_RESTORE_STATE	#
-#define CFI_UNDEFINED	#
-#define CFI_SIGNAL_FRAME	#
+.macro ignore a=0, b=0, c=0, d=0
+.endm
+
+#define CFI_STARTPROC	ignore
+#define CFI_ENDPROC	ignore
+#define CFI_DEF_CFA	ignore
+#define CFI_DEF_CFA_REGISTER	ignore
+#define CFI_DEF_CFA_OFFSET	ignore
+#define CFI_ADJUST_CFA_OFFSET	ignore
+#define CFI_OFFSET	ignore
+#define CFI_REL_OFFSET	ignore
+#define CFI_REGISTER	ignore
+#define CFI_RESTORE	ignore
+#define CFI_REMEMBER_STATE	ignore
+#define CFI_RESTORE_STATE	ignore
+#define CFI_UNDEFINED	ignore
+#define CFI_SIGNAL_FRAME	ignore
 
 #endif