diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:21:17 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:21:17 -0500 |
| commit | ce1e7a2ac721eb9d825b63f74752d0c9e0c635c2 (patch) | |
| tree | a7c0d18d6486734dffb9498e30db5b226b6e23bf /include/linux/file.h | |
| parent | c2956a3b0d1c17b38da369811a6ce93eb7a01a04 (diff) | |
| parent | 75deb6fa985bd3162b9472f1fc394e23294da816 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'include/linux/file.h')
| -rw-r--r-- | include/linux/file.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/file.h b/include/linux/file.h index 418b6101b59a..9901b850f2e4 100644 --- a/include/linux/file.h +++ b/include/linux/file.h | |||
| @@ -60,8 +60,6 @@ extern void put_filp(struct file *); | |||
| 60 | extern int get_unused_fd(void); | 60 | extern int get_unused_fd(void); |
| 61 | extern void FASTCALL(put_unused_fd(unsigned int fd)); | 61 | extern void FASTCALL(put_unused_fd(unsigned int fd)); |
| 62 | struct kmem_cache; | 62 | struct kmem_cache; |
| 63 | extern void filp_ctor(void * objp, struct kmem_cache *cachep, unsigned long cflags); | ||
| 64 | extern void filp_dtor(void * objp, struct kmem_cache *cachep, unsigned long dflags); | ||
| 65 | 63 | ||
| 66 | extern struct file ** alloc_fd_array(int); | 64 | extern struct file ** alloc_fd_array(int); |
| 67 | extern void free_fd_array(struct file **, int); | 65 | extern void free_fd_array(struct file **, int); |