diff options
| author | Thomas Zimmermann <[email protected]> | 2024-10-25 15:24:08 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <[email protected]> | 2024-10-25 15:24:08 +0200 |
| commit | fc5ced75d6dffc9e2a441520b7dc587b95281f86 (patch) | |
| tree | 9b24b900aeb4d8174677204b7aa171d4a8afd98c /include/linux/percpu.h | |
| parent | a85df8c7b5ee2d3d4823befada42c5c41aff4cb0 (diff) | |
| parent | 4d95a12beba146b0ca2de59c7ce905bc0aadfd0c (diff) | |
Merge drm/drm-fixes into drm-misc-fixes
Backmerging to get the latest fixes from upstream.
Signed-off-by: Thomas Zimmermann <[email protected]>
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 |