From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 12 Aug 2024 00:42:35 +0000 (+1000)
Subject: crypto: spacc - Add ifndef around MIN
X-Git-Tag: microblaze-v6.13~81^2~74
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=2d6213bd592b4731b53ece3492f9d1d18e97eb5e;p=linux-2.6-microblaze.git

crypto: spacc - Add ifndef around MIN

Fixup for "crypto: spacc - Add SPAcc Skcipher support"
interacting with commit

  1a251f52cfdc ("minmax: make generic MIN() and MAX() macros available everywhere")

from Linus' tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Reintroduced MIN macro with ifndef around it.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---

diff --git a/drivers/crypto/dwc-spacc/spacc_manager.c b/drivers/crypto/dwc-spacc/spacc_manager.c
index 3b26b27a998f..d42ae499e959 100644
--- a/drivers/crypto/dwc-spacc/spacc_manager.c
+++ b/drivers/crypto/dwc-spacc/spacc_manager.c
@@ -1,8 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0
 
+#include <linux/minmax.h>
 #include "spacc_core.h"
 
+#ifndef MIN
 #define MIN(x, y) (((x) < (y)) ? (x) : (y))
+#endif
 
 /* prevent reading past the end of the buffer */
 static void read_from_buf(unsigned char *dst, unsigned char *src,