diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-14 22:29:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-14 22:29:31 +0200 |
| commit | d985524680b77a1cf90738db9a2d72065a746afa (patch) | |
| tree | 101857c3e59f9238b0c7d4bbbf58e46476957387 /kernel/pid.c | |
| parent | MAINTAINERS: fpga: Update email and add patchwork URL (diff) | |
| parent | Linux 4.13-rc5 (diff) | |
| download | linux-d985524680b77a1cf90738db9a2d72065a746afa.tar.xz linux-d985524680b77a1cf90738db9a2d72065a746afa.zip | |
Merge 4.13-rc5 into char-misc-next
We want the firmware, and other changes, in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/pid.c')
| -rw-r--r-- | kernel/pid.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/pid.c b/kernel/pid.c index 731c4e528f4e..c69c30d827e5 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -575,13 +575,10 @@ struct pid *find_ge_pid(int nr, struct pid_namespace *ns) */ void __init pidhash_init(void) { - unsigned int pidhash_size; - pid_hash = alloc_large_system_hash("PID", sizeof(*pid_hash), 0, 18, HASH_EARLY | HASH_SMALL | HASH_ZERO, &pidhash_shift, NULL, 0, 4096); - pidhash_size = 1U << pidhash_shift; } void __init pidmap_init(void) |