From 13e3a19e94e97bb9a0634bad10f1a74ba363fadf Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Wed, 22 May 2019 05:12:16 -0400 Subject: [PATCH] Remove __KERNEL__ guard Andy's code is used in the Linux kernel. The define is not needed here. --- sha256_armv4.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sha256_armv4.S b/sha256_armv4.S index d4b63f95..ea13552c 100644 --- a/sha256_armv4.S +++ b/sha256_armv4.S @@ -103,7 +103,7 @@ K256: .word 0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2 .size K256,.-K256 .word 0 @ terminator -#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__) +#if __ARM_MAX_ARCH__>=7 .LCRYPTOGAMS_armcap: # ifdef _WIN32 .word CRYPTOGAMS_armcap @@ -122,7 +122,7 @@ sha256_block_data_order: #else adr r3,.Lsha256_block_data_order #endif -#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__) +#if __ARM_MAX_ARCH__>=7 ldr r12,.LCRYPTOGAMS_armcap # if !defined(_WIN32) ldr r12,[r3,r12] @ CRYPTOGAMS_armcap @@ -2687,6 +2687,6 @@ sha256_block_data_order_neon: .size sha256_block_data_order_neon,.-sha256_block_data_order_neon #endif -#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__) +#if __ARM_MAX_ARCH__>=7 .comm CRYPTOGAMS_armcap,4,4 #endif