Merge tag 'wireless-drivers-next-for-davem-2018-02-08' of git://git.kernel.org/pub...

[sfrench/cifs-2.6.git] / arch / arm / include / asm / unified.h

diff --git a/arch/arm/include/asm/unified.h b/arch/arm/include/asm/unified.h
index a91ae499614cbb5e1c23a646a04082026bec061f..2c3b952be63ebbc536d767798eb21dfba153d25b 100644 (file)
--- a/arch/arm/include/asm/unified.h
+++ b/arch/arm/include/asm/unified.h
@@ -20,8 +20,10 @@
 #ifndef __ASM_UNIFIED_H
 #define __ASM_UNIFIED_H
 
-#if defined(__ASSEMBLY__) && defined(CONFIG_ARM_ASM_UNIFIED)
+#if defined(__ASSEMBLY__)
        .syntax unified
+#else
+__asm__(".syntax unified");
 #endif
 
 #ifdef CONFIG_CPU_V7M
@@ -64,77 +66,4 @@
 
 #endif /* CONFIG_THUMB2_KERNEL */
 
-#ifndef CONFIG_ARM_ASM_UNIFIED
-
-/*
- * If the unified assembly syntax isn't used (in ARM mode), these
- * macros expand to an empty string
- */
-#ifdef __ASSEMBLY__
-       .macro  it, cond
-       .endm
-       .macro  itt, cond
-       .endm
-       .macro  ite, cond
-       .endm
-       .macro  ittt, cond
-       .endm
-       .macro  itte, cond
-       .endm
-       .macro  itet, cond
-       .endm
-       .macro  itee, cond
-       .endm
-       .macro  itttt, cond
-       .endm
-       .macro  ittte, cond
-       .endm
-       .macro  ittet, cond
-       .endm
-       .macro  ittee, cond
-       .endm
-       .macro  itett, cond
-       .endm
-       .macro  itete, cond
-       .endm
-       .macro  iteet, cond
-       .endm
-       .macro  iteee, cond
-       .endm
-#else  /* !__ASSEMBLY__ */
-__asm__(
-"      .macro  it, cond\n"
-"      .endm\n"
-"      .macro  itt, cond\n"
-"      .endm\n"
-"      .macro  ite, cond\n"
-"      .endm\n"
-"      .macro  ittt, cond\n"
-"      .endm\n"
-"      .macro  itte, cond\n"
-"      .endm\n"
-"      .macro  itet, cond\n"
-"      .endm\n"
-"      .macro  itee, cond\n"
-"      .endm\n"
-"      .macro  itttt, cond\n"
-"      .endm\n"
-"      .macro  ittte, cond\n"
-"      .endm\n"
-"      .macro  ittet, cond\n"
-"      .endm\n"
-"      .macro  ittee, cond\n"
-"      .endm\n"
-"      .macro  itett, cond\n"
-"      .endm\n"
-"      .macro  itete, cond\n"
-"      .endm\n"
-"      .macro  iteet, cond\n"
-"      .endm\n"
-"      .macro  iteee, cond\n"
-"      .endm\n");
-#endif /* __ASSEMBLY__ */
-
-#endif /* CONFIG_ARM_ASM_UNIFIED */
-
 #endif /* !__ASM_UNIFIED_H */