From 5b070ec7ee355c22fe0a7f6277da958a78b6186e Mon Sep 17 00:00:00 2001 From: Denis Cheng Date: Sun, 16 Sep 2007 16:34:39 -0700 Subject: [PATCH] --- yaml --- r: 66610 b: refs/heads/master c: 99406c885ab27c369fa4a1b15c4a5a5ad0d61fcd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/netlink/af_netlink.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a20a80aedbcf..b1817c2a55f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52886051ffdc087a4f7f11540395fd64040101ad +refs/heads/master: 99406c885ab27c369fa4a1b15c4a5a5ad0d61fcd diff --git a/trunk/net/netlink/af_netlink.c b/trunk/net/netlink/af_netlink.c index c68888b25756..bca93e19bf40 100644 --- a/trunk/net/netlink/af_netlink.c +++ b/trunk/net/netlink/af_netlink.c @@ -1969,7 +1969,7 @@ static int __init netlink_proto_init(void) order = get_bitmask_order(max) - 1 + PAGE_SHIFT; max = (1UL << order) / sizeof(struct hlist_head); - order = get_bitmask_order(max > UINT_MAX ? UINT_MAX : max) - 1; + order = get_bitmask_order(min(max, (unsigned long)UINT_MAX)) - 1; for (i = 0; i < MAX_LINKS; i++) { struct nl_pid_hash *hash = &nl_table[i].hash;