Commit 99406c88 authored by Denis Cheng's avatar Denis Cheng Committed by David S. Miller

[NETLINK]: use the macro min(x,y) provided by <linux/kernel.h> instead

Signed-off-by: default avatarDenis Cheng <crquan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 52886051
...@@ -1969,7 +1969,7 @@ static int __init netlink_proto_init(void) ...@@ -1969,7 +1969,7 @@ static int __init netlink_proto_init(void)
order = get_bitmask_order(max) - 1 + PAGE_SHIFT; order = get_bitmask_order(max) - 1 + PAGE_SHIFT;
max = (1UL << order) / sizeof(struct hlist_head); 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++) { for (i = 0; i < MAX_LINKS; i++) {
struct nl_pid_hash *hash = &nl_table[i].hash; struct nl_pid_hash *hash = &nl_table[i].hash;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment