diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
| commit | 169ed55bd30305b933f52bfab32a58671d44ab68 (patch) | |
| tree | 32e280957474f458901abfce16fa2a1687ef7497 /fs/proc/root.c | |
| parent | 3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 (diff) | |
| parent | 45f81b1c96d9793e47ce925d257ea693ce0b193e (diff) | |
Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'fs/proc/root.c')
| -rw-r--r-- | fs/proc/root.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index 4258384ed22d..93d99b316325 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
| @@ -179,6 +179,7 @@ static int proc_root_readdir(struct file * filp, | |||
| 179 | static const struct file_operations proc_root_operations = { | 179 | static const struct file_operations proc_root_operations = { |
| 180 | .read = generic_read_dir, | 180 | .read = generic_read_dir, |
| 181 | .readdir = proc_root_readdir, | 181 | .readdir = proc_root_readdir, |
| 182 | .llseek = default_llseek, | ||
| 182 | }; | 183 | }; |
| 183 | 184 | ||
| 184 | /* | 185 | /* |