diff options
| author | Tvrtko Ursulin <tursulin@ursulin.net> | 2025-02-05 12:29:14 +0300 |
|---|---|---|
| committer | Tvrtko Ursulin <tursulin@ursulin.net> | 2025-02-05 12:29:14 +0300 |
| commit | c771600c6af14749609b49565ffb4cac2959710d (patch) | |
| tree | e9be426f1b32598527127fd0fa1b265a7cc83044 /include/linux/threads.h | |
| parent | 4a82ceb04ad4bbb9cc20925abccb70938313e555 (diff) | |
| parent | 2014c95afecee3e76ca4a56956a936e23283f05b (diff) | |
| download | linux-c771600c6af14749609b49565ffb4cac2959710d.tar.xz | |
Merge drm/drm-next into drm-intel-gt-next
We need
4ba4f1afb6a9 ("perf: Generic hotplug support for a PMU with a scope")
in order to land a i915 PMU simplification and a fix. That landed in 6.12
and we are stuck at 6.9 so lets bump things forward.
Signed-off-by: Tvrtko Ursulin <tursulin@ursulin.net>
Diffstat (limited to 'include/linux/threads.h')
| -rw-r--r-- | include/linux/threads.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/threads.h b/include/linux/threads.h index c34173e6c5f1..1674a471b0b4 100644 --- a/include/linux/threads.h +++ b/include/linux/threads.h @@ -25,13 +25,13 @@ /* * This controls the default maximum pid allocated to a process */ -#define PID_MAX_DEFAULT (CONFIG_BASE_SMALL ? 0x1000 : 0x8000) +#define PID_MAX_DEFAULT (IS_ENABLED(CONFIG_BASE_SMALL) ? 0x1000 : 0x8000) /* * A maximum of 4 million PIDs should be enough for a while. * [NOTE: PID/TIDs are limited to 2^30 ~= 1 billion, see FUTEX_TID_MASK.] */ -#define PID_MAX_LIMIT (CONFIG_BASE_SMALL ? PAGE_SIZE * 8 : \ +#define PID_MAX_LIMIT (IS_ENABLED(CONFIG_BASE_SMALL) ? PAGE_SIZE * 8 : \ (sizeof(long) > 4 ? 4 * 1024 * 1024 : PID_MAX_DEFAULT)) /* |