From 6751b87143a249cf66dfa57838c568e321d3b7d9 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Tue, 6 May 2025 06:38:56 +0000
Subject: [PATCH] ANDROID: GKI: fix up crc issue in
 crypto_get_default_null_skcipher()

In commit e27244cbe106 ("crypto: null - Use spin lock instead of
mutex"), the .h files get shuffled around a bit, which causes a CRC
mismatch in crypto_get_default_null_skcipher().  Put them back to the
way they were if we are calculating crcs, to keep the build clean.

Bug: 161946584
Fixes: e27244cbe106 ("crypto: null - Use spin lock instead of mutex")
Change-Id: I7d1490944efbbd3bdc99e4116014b5f32ab3d708
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---
 crypto/crypto_null.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/crypto_null.c b/crypto/crypto_null.c
index 337867028653..3170e2fdcfd3 100644
--- a/crypto/crypto_null.c
+++ b/crypto/crypto_null.c
@@ -17,7 +17,11 @@
 #include <crypto/internal/skcipher.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#ifdef __GENKSYMS__ // CRC fix for e307c54ac819 ("crypto: null - Use spin lock instead of mutex")
+#include <linux/mm.h>
+#else
 #include <linux/spinlock.h>
+#endif
 #include <linux/string.h>
 
 static DEFINE_SPINLOCK(crypto_default_null_skcipher_lock);