diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-08 03:27:31 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-08 03:27:31 -0400 |
| commit | e7a963ef20cabde53d0e609737764ddc65f4605a (patch) | |
| tree | d2bf292f2dde9c6ee213d401abbbdc63fb3afa75 /include/linux/fs.h | |
| parent | a2494b9b5fb702becaf8d8e3138f7a1a0d3c537e (diff) | |
| parent | 3ff323f89075624b6891e7c428edb8e8a35be13c (diff) | |
Merge branches 'sh/smp' and 'sh/stable-updates'
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 67888a9e0655..73e9b643e455 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -2123,7 +2123,7 @@ extern struct file *do_filp_open(int dfd, const char *pathname, | |||
| 2123 | int open_flag, int mode, int acc_mode); | 2123 | int open_flag, int mode, int acc_mode); |
| 2124 | extern int may_open(struct path *, int, int); | 2124 | extern int may_open(struct path *, int, int); |
| 2125 | 2125 | ||
| 2126 | extern int kernel_read(struct file *, unsigned long, char *, unsigned long); | 2126 | extern int kernel_read(struct file *, loff_t, char *, unsigned long); |
| 2127 | extern struct file * open_exec(const char *); | 2127 | extern struct file * open_exec(const char *); |
| 2128 | 2128 | ||
| 2129 | /* fs/dcache.c -- generic fs support functions */ | 2129 | /* fs/dcache.c -- generic fs support functions */ |