From: Denis Cheng <crquan@gmail.com>
Date: Sun, 16 Sep 2007 23:34:39 +0000 (-0700)
Subject: [NETLINK]: use the macro min(x,y) provided by <linux/kernel.h> instead
X-Git-Tag: v2.6.24-rc1~1454^2~473
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=99406c885ab27c369fa4a1b15c4a5a5ad0d61fcd;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index c68888b2575..bca93e19bf4 100644
--- a/net/netlink/af_netlink.c
+++ b/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;