diff -Nru a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c --- a/net/ipv4/ipvs/ip_vs_ctl.c Thu Sep 18 00:43:00 2003 +++ b/net/ipv4/ipvs/ip_vs_ctl.c Thu Sep 18 00:43:00 2003 @@ -46,7 +46,7 @@ static DECLARE_MUTEX(__ip_vs_mutex); /* lock for service table */ -rwlock_t __ip_vs_svc_lock = RW_LOCK_UNLOCKED; +static rwlock_t __ip_vs_svc_lock = RW_LOCK_UNLOCKED; /* lock for table with the real services */ static rwlock_t __ip_vs_rs_lock = RW_LOCK_UNLOCKED; @@ -1912,7 +1912,7 @@ static inline int __ip_vs_get_service_entries(const struct ip_vs_get_services *get, - struct ip_vs_get_services *uptr) + struct ip_vs_get_services __user *uptr) { int idx, count=0; struct ip_vs_service *svc; @@ -1955,7 +1955,7 @@ static inline int __ip_vs_get_dest_entries(const struct ip_vs_get_dests *get, - struct ip_vs_get_dests *uptr) + struct ip_vs_get_dests __user *uptr) { struct ip_vs_service *svc; int ret = 0; @@ -2034,7 +2034,7 @@ }; static int -do_ip_vs_get_ctl(struct sock *sk, int cmd, void *user, int *len) +do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) { unsigned char arg[128]; int ret = 0;