diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-21 08:53:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-21 08:53:43 +0200 |
| commit | c6d9e43954bfa7415a1e9efdb2806ec1d8a8afc8 (patch) | |
| tree | 4f8b23679ea48fcfbee582f876f62e144c71f8d7 /include/linux/percpu.h | |
| parent | 07b887f8236eb3ed52f1fe83e385e6436dc4b052 (diff) | |
| parent | 42f7652d3eb527d03665b09edac47f85fb600924 (diff) | |
Merge 6.12-rc4 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/percpu.h')
| -rw-r--r-- | include/linux/percpu.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h index b6321fc49159..52b5ea663b9f 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h @@ -41,7 +41,11 @@ PCPU_MIN_ALLOC_SHIFT) #ifdef CONFIG_RANDOM_KMALLOC_CACHES -#define PERCPU_DYNAMIC_SIZE_SHIFT 12 +# if defined(CONFIG_LOCKDEP) && !defined(CONFIG_PAGE_SIZE_4KB) +# define PERCPU_DYNAMIC_SIZE_SHIFT 13 +# else +# define PERCPU_DYNAMIC_SIZE_SHIFT 12 +#endif /* LOCKDEP and PAGE_SIZE > 4KiB */ #else #define PERCPU_DYNAMIC_SIZE_SHIFT 10 #endif |