diff options
| author | Ingo Molnar | 2008-07-31 18:43:41 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-31 18:43:41 +0200 |
| commit | 85e9ca333d03fbd56b9e123c8456f0d98e20faad (patch) | |
| tree | 7bb15ada5f536950efa23ad60ea9eea60380ca1c /include/linux/dcache.h | |
| parent | documentation: move hpet.txt to timers/ subdirectory (diff) | |
| parent | Linux 2.6.27-rc1 (diff) | |
| download | kernel-qcow2-linux-85e9ca333d03fbd56b9e123c8456f0d98e20faad.tar.gz kernel-qcow2-linux-85e9ca333d03fbd56b9e123c8456f0d98e20faad.tar.xz kernel-qcow2-linux-85e9ca333d03fbd56b9e123c8456f0d98e20faad.zip | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'include/linux/dcache.h')
| -rw-r--r-- | include/linux/dcache.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 2a6639407c80..98202c672fde 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -3,6 +3,7 @@ #include <asm/atomic.h> #include <linux/list.h> +#include <linux/rculist.h> #include <linux/spinlock.h> #include <linux/cache.h> #include <linux/rcupdate.h> @@ -300,7 +301,7 @@ extern int d_validate(struct dentry *, struct dentry *); extern char *dynamic_dname(struct dentry *, char *, int, const char *, ...); extern char *__d_path(const struct path *path, struct path *root, char *, int); -extern char *d_path(struct path *, char *, int); +extern char *d_path(const struct path *, char *, int); extern char *dentry_path(struct dentry *, char *, int); /* Allocation counts.. */ |