From bb5b6e6c4dea4242f6ff75fa7adecea4f34935f1 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 4 Feb 2002 20:10:26 -0800 Subject: v2.4.8.4 -> v2.4.9 - David Miller: sparc updates, FAT fs fixes, btaudio build fix - David Gibson: Orinoco driver update - Kevin Fleming: more disks the HPT controller doesn't like - David Miller: "min()/max()" cleanups. Understands signs and sizes. - Ben LaHaise: make vma merging more generous, help Mozilla /proc/<>/maps - Jens Axboe: CD updates - Trond Myklebust: save away NFS credentials in inode, so that mmap can writeout. - Mark Hemment: HIGHMEM ops cleanups - Jes Sorensen: use "unsigned long" for flags in various drivers --- net/ipx/af_ipx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'net/ipx') diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c index 669cdbb06c3f..36df373aa1bb 100644 --- a/net/ipx/af_ipx.c +++ b/net/ipx/af_ipx.c @@ -1890,7 +1890,7 @@ static int ipx_getsockopt(struct socket *sock, int level, int optname, if (get_user(len, optlen)) goto out; - len = min(len, sizeof(int)); + len = min(unsigned int, len, sizeof(int)); ret = -EINVAL; if(len < 0) goto out; -- cgit v1.2.3