diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-20 16:13:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-20 16:13:58 -0800 |
| commit | 8ebbfb49574818f07a25bc119b1bbdf1c2853a39 (patch) | |
| tree | e7b1ea6c6a3ea522654c685f2f0c9f41466fdcf9 /kernel | |
| parent | 39e255dab5a993cbebb35598015da1d4a0eb3727 (diff) | |
| parent | 847c9db5cb50841589b8ebd3da0769b1b02fb3b2 (diff) | |
| download | linux-8ebbfb49574818f07a25bc119b1bbdf1c2853a39.tar.gz linux-8ebbfb49574818f07a25bc119b1bbdf1c2853a39.tar.bz2 linux-8ebbfb49574818f07a25bc119b1bbdf1c2853a39.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Assorted fixes, sat in -next for a week or so...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
ocfs2: deal with wraparounds of i_nlink in ocfs2_rename()
vfs: fix compat_sys_stat() handling of overflows in st_nlink
quota: Fix deadlock with suspend and quotas
vfs: Provide function to get superblock and wait for it to thaw
vfs: fix panic in __d_lookup() with high dentry hashtable counts
autofs4 - fix lockdep splat in autofs
vfs: fix d_inode_lookup() dentry ref leak
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/pid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/pid.c b/kernel/pid.c index ce8e00deaccb..9f08dfabaf13 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -543,12 +543,12 @@ struct pid *find_ge_pid(int nr, struct pid_namespace *ns) */ void __init pidhash_init(void) { - int i, pidhash_size; + unsigned int i, pidhash_size; pid_hash = alloc_large_system_hash("PID", sizeof(*pid_hash), 0, 18, HASH_EARLY | HASH_SMALL, &pidhash_shift, NULL, 4096); - pidhash_size = 1 << pidhash_shift; + pidhash_size = 1U << pidhash_shift; for (i = 0; i < pidhash_size; i++) INIT_HLIST_HEAD(&pid_hash[i]); |