Commit 2d6213bd authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Herbert Xu
Browse files

crypto: spacc - Add ifndef around MIN



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

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

from Linus' tree.

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

Reintroduced MIN macro with ifndef around it.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 00141249
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
// 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,