Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / fs / proc / fd.h

diff --git a/fs/proc/fd.h b/fs/proc/fd.h
index 7c047f256ae2ccb945aab10d8688d6305b5a0eb7..46dafadd0083a5b59fe7c7a5bc6c8d33282a74be 100644 (file)
--- a/fs/proc/fd.h
+++ b/fs/proc/fd.h
@@ -11,7 +11,7 @@ extern const struct inode_operations proc_fdinfo_inode_operations;
 
 extern int proc_fd_permission(struct inode *inode, int mask);
 
-static inline int proc_fd(struct inode *inode)
+static inline unsigned int proc_fd(struct inode *inode)
 {
        return PROC_I(inode)->fd;
 }