diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2002-09-03 00:49:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-09-03 00:49:04 -0700 |
| commit | 3d5fa36bf0c232f70db4bd15a50bbe322800bcdb (patch) | |
| tree | 5ada31234f00d9b893c77e713ef7a3e900550041 /include/linux | |
| parent | 96ca2f806ceaf0f8fbde2548f51d6afc0a0fe7e3 (diff) | |
| parent | 1314cad1540faf6b81e455b2267ce23c2fa1d698 (diff) | |
Merge nuts.ninka.net:/home/davem/src/BK/network-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 5 | ||||
| -rw-r--r-- | include/linux/pci.h | 2 | ||||
| -rw-r--r-- | include/linux/ptrace.h | 1 |
3 files changed, 6 insertions, 2 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); |