mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-13 16:50:05 +00:00
[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>
This commit is contained in:
parent
52886051ff
commit
99406c885a
@ -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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user