]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[NETLINK]: use the macro min(x,y) provided by <linux/kernel.h> instead
authorDenis Cheng <crquan@gmail.com>
Sun, 16 Sep 2007 23:34:39 +0000 (16:34 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 10 Oct 2007 23:51:25 +0000 (16:51 -0700)
Signed-off-by: Denis Cheng <crquan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netlink/af_netlink.c

index c68888b25756a7a395d687866b5eb8a5bec324a3..bca93e19bf4010a77b481d121462d52addb04b6a 100644 (file)
@@ -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;