diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-08-12 03:42:35 +0300 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2024-08-13 07:13:56 +0300 |
| commit | 2d6213bd592b4731b53ece3492f9d1d18e97eb5e (patch) | |
| tree | fdf20641f63bf045996ffaf990bcf33168299c3b /drivers/crypto | |
| parent | 001412493e74d89166d2441b622eeaea00511bdc (diff) | |
| download | linux-2d6213bd592b4731b53ece3492f9d1d18e97eb5e.tar.xz | |
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>
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/dwc-spacc/spacc_manager.c | 3 |
1 files changed, 3 insertions, 0 deletions
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, |