diff options
author | Denis Cheng <crquan@gmail.com> | 2007-09-16 19:34:39 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:51:25 -0400 |
commit | 99406c885ab27c369fa4a1b15c4a5a5ad0d61fcd (patch) | |
tree | 0ea0cc02e563297809fa393c5677ae0022efa877 | |
parent | 52886051ffdc087a4f7f11540395fd64040101ad (diff) |
[NETLINK]: use the macro min(x,y) provided by <linux/kernel.h> instead
Signed-off-by: Denis Cheng <crquan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/netlink/af_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index c68888b25756..bca93e19bf40 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c | |||
@@ -1969,7 +1969,7 @@ static int __init netlink_proto_init(void) | |||
1969 | 1969 | ||
1970 | order = get_bitmask_order(max) - 1 + PAGE_SHIFT; | 1970 | order = get_bitmask_order(max) - 1 + PAGE_SHIFT; |
1971 | max = (1UL << order) / sizeof(struct hlist_head); | 1971 | max = (1UL << order) / sizeof(struct hlist_head); |
1972 | order = get_bitmask_order(max > UINT_MAX ? UINT_MAX : max) - 1; | 1972 | order = get_bitmask_order(min(max, (unsigned long)UINT_MAX)) - 1; |
1973 | 1973 | ||
1974 | for (i = 0; i < MAX_LINKS; i++) { | 1974 | for (i = 0; i < MAX_LINKS; i++) { |
1975 | struct nl_pid_hash *hash = &nl_table[i].hash; | 1975 | struct nl_pid_hash *hash = &nl_table[i].hash; |