From 780269c181e73de1ccb4de3b42dee87754182058 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sun, 30 Sep 2018 04:28:35 +0200
Subject: crypto: use ZINC_ARCH macros

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 src/crypto/zinc/chacha20/chacha20-arm-glue.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/crypto/zinc/chacha20')

diff --git a/src/crypto/zinc/chacha20/chacha20-arm-glue.h b/src/crypto/zinc/chacha20/chacha20-arm-glue.h
index 2504448..163815f 100644
--- a/src/crypto/zinc/chacha20/chacha20-arm-glue.h
+++ b/src/crypto/zinc/chacha20/chacha20-arm-glue.h
@@ -5,7 +5,7 @@
 
 #include <asm/hwcap.h>
 #include <asm/neon.h>
-#if defined(CONFIG_ARM)
+#if defined(CONFIG_ZINC_ARCH_ARM)
 #include <asm/system_info.h>
 #include <asm/cputype.h>
 #endif
@@ -20,9 +20,9 @@ static bool chacha20_use_neon __ro_after_init;
 
 static void __init chacha20_fpu_init(void)
 {
-#if defined(CONFIG_ARM64)
+#if defined(CONFIG_ZINC_ARCH_ARM64)
 	chacha20_use_neon = elf_hwcap & HWCAP_ASIMD;
-#elif defined(CONFIG_ARM)
+#elif defined(CONFIG_ZINC_ARCH_ARM)
 	switch (read_cpuid_part()) {
 	case ARM_CPU_PART_CORTEX_A7:
 	case ARM_CPU_PART_CORTEX_A5:
@@ -73,7 +73,7 @@ static inline bool hchacha20_arch(u32 derived_key[CHACHA20_KEY_WORDS],
 				  const u8 key[HCHACHA20_KEY_SIZE],
 				  simd_context_t *simd_context)
 {
-	if (IS_ENABLED(CONFIG_ARM)) {
+	if (IS_ENABLED(CONFIG_ZINC_ARCH_ARM)) {
 		u32 x[] = { CHACHA20_CONSTANT_EXPA,
 			    CHACHA20_CONSTANT_ND_3,
 			    CHACHA20_CONSTANT_2_BY,
-- 
cgit v1.2.3