Merge nuts.ninka.net:/home/davem/src/BK/network-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

5 files changed, 7 insertions, 9 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 598561bc18c2..befc2bbb5f3c 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -432,6 +432,7 @@ static inline struct inode *SOCK_INODE(struct socket *socket)
 #include <linux/efs_fs_i.h>
 
 struct fown_struct {
+	rwlock_t lock;          /* protects pid, uid, euid fields */
 	int pid;		/* pid or -pgrp where SIGIO should be sent */
 	uid_t uid, euid;	/* uid/euid of process setting the owner */
 	int signum;		/* posix.1b rt signal to be delivered on IO */
@@ -615,6 +616,10 @@ extern void kill_fasync(struct fasync_struct **, int, int);
 /* only for net: no internal synchronization */
 extern void __kill_fasync(struct fasync_struct *, int, int);
 
+extern int f_setown(struct file *filp, unsigned long arg, int force);
+extern void f_delown(struct file *filp);
+extern int send_sigurg(struct fown_struct *fown);
+
 /*
  *	Umount options
  */
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 8ee2d9cf4053..3c76341f02bf 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -591,8 +591,6 @@ static int inline pci_write_config_dword(struct pci_dev *dev, int where, u32 val
 
 extern spinlock_t pci_lock;
 
-extern spinlock_t pci_lock;
-
 int pci_enable_device(struct pci_dev *dev);
 void pci_disable_device(struct pci_dev *dev);
 void pci_set_master(struct pci_dev *dev);
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 78512fa922b9..a0378ef64867 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -24,6 +24,7 @@
 #define PTRACE_SYSCALL		  24
 
 #include <asm/ptrace.h>
+#include <linux/sched.h>
 
 extern int ptrace_readdata(struct task_struct *tsk, unsigned long src, char *dst, int len);
 extern int ptrace_writedata(struct task_struct *tsk, char * src, unsigned long dst, int len);
diff --git a/include/net/inet_common.h b/include/net/inet_common.h
index bbb1fa70099e..3dcab5199cc1 100644
--- a/include/net/inet_common.h
+++ b/include/net/inet_common.h
@@ -34,9 +34,6 @@ extern int			inet_setsockopt(struct socket *sock, int level,
 extern int			inet_getsockopt(struct socket *sock, int level,
 						int optname, char *optval, 
 						int *optlen);
-extern int			inet_fcntl(struct socket *sock, 
-					   unsigned int cmd, 
-					   unsigned long arg);
 extern int			inet_listen(struct socket *sock, int backlog);
 
 extern void			inet_sock_release(struct sock *sk);
diff --git a/include/net/sock.h b/include/net/sock.h
index ccf82ecab360..da47601e4290 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -132,7 +132,6 @@ struct sock {
 	unsigned char		rcvtstamp;
 	unsigned char		no_largesend;
 	int			route_caps;
-	int			proc;
 	unsigned long	        lingertime;
 
 	int			hashent;
@@ -292,7 +291,6 @@ static __inline__ void sock_prot_dec_use(struct proto *prot)
 #define SOCK_BINDADDR_LOCK	4
 #define SOCK_BINDPORT_LOCK	8
 
-#include <linux/fs.h>	/* just for inode - yeuch.*/
 
 
 /* Used by processes to "lock" a socket state, so that
@@ -362,6 +360,7 @@ extern struct sk_buff 		*sock_alloc_send_pskb(struct sock *sk,
 						      int *errcode);
 extern void *sock_kmalloc(struct sock *sk, int size, int priority);
 extern void sock_kfree_s(struct sock *sk, void *mem, int size);
+extern void sk_send_sigurg(struct sock *sk);
 
 /*
  * Functions to fill in entries in struct proto_ops when a protocol
@@ -388,8 +387,6 @@ extern int			sock_no_getsockopt(struct socket *, int , int,
 						   char *, int *);
 extern int			sock_no_setsockopt(struct socket *, int, int,
 						   char *, int);
-extern int 			sock_no_fcntl(struct socket *, 
-					      unsigned int, unsigned long);
 extern int                      sock_no_sendmsg(struct socket *,
 						struct msghdr *, int,
 						struct scm_cookie *);