diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-06-03 05:50:18 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-06-03 05:50:18 -0400 |
commit | 26b73da3604cc1a6596406d136b14d1a01c3676f (patch) | |
tree | c7839809e35fce4868910742157e8ef96782b378 /kernel/fork.c | |
parent | 5ca584d935c32906d114924dc0e1dbfcbb13fdb2 (diff) | |
parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) |
Merge tag 'v5.2-rc3' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/fork.c')
-rw-r--r-- | kernel/fork.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index b2b87d450b80..75675b9bf6df 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -123,7 +123,7 @@ | |||
123 | unsigned long total_forks; /* Handle normal Linux uptimes. */ | 123 | unsigned long total_forks; /* Handle normal Linux uptimes. */ |
124 | int nr_threads; /* The idle threads do not count.. */ | 124 | int nr_threads; /* The idle threads do not count.. */ |
125 | 125 | ||
126 | int max_threads; /* tunable limit on nr_threads */ | 126 | static int max_threads; /* tunable limit on nr_threads */ |
127 | 127 | ||
128 | DEFINE_PER_CPU(unsigned long, process_counts) = 0; | 128 | DEFINE_PER_CPU(unsigned long, process_counts) = 0; |
129 | 129 | ||