diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-12 18:47:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-12 18:47:17 +0200 |
| commit | 9f3eb413606b259c03ecbd20d61e5f7906681891 (patch) | |
| tree | cdbd0982a72e3427bb15bfdc6510d86745d7ec0e /mm/zsmalloc.c | |
| parent | 259b46204885431f2853afa2a2bffa63f3705e67 (diff) | |
| parent | 7c626ce4bae1ac14f60076d00eafe71af30450ba (diff) | |
| download | linux-9f3eb413606b259c03ecbd20d61e5f7906681891.tar.gz linux-9f3eb413606b259c03ecbd20d61e5f7906681891.tar.bz2 linux-9f3eb413606b259c03ecbd20d61e5f7906681891.zip | |
Merge 6.11-rc3 into tty-next
We need the tty/serial fixes in here to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/zsmalloc.c')
| -rw-r--r-- | mm/zsmalloc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 5d6581ab7c07..2d3163e4da96 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -120,8 +120,6 @@ #define CLASS_BITS 8 #define MAGIC_VAL_BITS 8 -#define MAX(a, b) ((a) >= (b) ? (a) : (b)) - #define ZS_MAX_PAGES_PER_ZSPAGE (_AC(CONFIG_ZSMALLOC_CHAIN_SIZE, UL)) /* ZS_MIN_ALLOC_SIZE must be multiple of ZS_ALIGN */ |