kevin/linux
1
Fork 0
Code

crypto: spacc - Add ifndef around MIN

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

  1a251f52cf ("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>
This commit is contained in:
Stephen Rothwell 2024-08-12 10:42:35 +10:00 committed by Herbert Xu
parent 001412493e
commit 2d6213bd59
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/crypto/dwc-spacc/spacc_manager.c
View File

@ -1,8 +1,11 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include <linux/minmax.h>
#include "spacc_core.h" #include "spacc_core.h"
#ifndef MIN
#define MIN(x, y) (((x) < (y)) ? (x) : (y)) #define MIN(x, y) (((x) < (y)) ? (x) : (y))
#endif
/* prevent reading past the end of the buffer */ /* prevent reading past the end of the buffer */
static void read_from_buf(unsigned char *dst, unsigned char *src, static void read_from_buf(unsigned char *dst, unsigned char *src,