diff --git a/include/asm-x86/dwarf2.h b/include/asm-x86/dwarf2.h
index 0bfe250894f77fe3db16afe332c75808626ae567..fd4a6a0393acb9171aea41ff18301005d00354f9 100644
--- a/include/asm-x86/dwarf2.h
+++ b/include/asm-x86/dwarf2.h
@@ -38,23 +38,23 @@
 
 /* Due to the structure of pre-exisiting code, don't use assembler line
    comment character # to ignore the arguments. Instead, use a dummy macro. */
-.macro ignore a=0, b=0, c=0, d=0
+.macro __cfi_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
+#define CFI_STARTPROC	__cfi_ignore
+#define CFI_ENDPROC	__cfi_ignore
+#define CFI_DEF_CFA	__cfi_ignore
+#define CFI_DEF_CFA_REGISTER	__cfi_ignore
+#define CFI_DEF_CFA_OFFSET	__cfi_ignore
+#define CFI_ADJUST_CFA_OFFSET	__cfi_ignore
+#define CFI_OFFSET	__cfi_ignore
+#define CFI_REL_OFFSET	__cfi_ignore
+#define CFI_REGISTER	__cfi_ignore
+#define CFI_RESTORE	__cfi_ignore
+#define CFI_REMEMBER_STATE __cfi_ignore
+#define CFI_RESTORE_STATE __cfi_ignore
+#define CFI_UNDEFINED __cfi_ignore
+#define CFI_SIGNAL_FRAME __cfi_ignore
 
 #endif