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 /arch/um/drivers/mconsole_kern.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 'arch/um/drivers/mconsole_kern.c')
| -rw-r--r-- | arch/um/drivers/mconsole_kern.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index ebc680717e59..975613b23dcf 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c | |||
| @@ -843,6 +843,7 @@ static ssize_t mconsole_proc_write(struct file *file, | |||
| 843 | static const struct file_operations mconsole_proc_fops = { | 843 | static const struct file_operations mconsole_proc_fops = { |
| 844 | .owner = THIS_MODULE, | 844 | .owner = THIS_MODULE, |
| 845 | .write = mconsole_proc_write, | 845 | .write = mconsole_proc_write, |
| 846 | .llseek = noop_llseek, | ||
| 846 | }; | 847 | }; |
| 847 | 848 | ||
| 848 | static int create_proc_mconsole(void) | 849 | static int create_proc_mconsole(void) |