summaryrefslogtreecommitdiffstats
path: root/arch/um/drivers/stdio_console.c
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-02-10 10:44:06 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-11 19:51:22 +0100
commita52f362f864f56238c9036f5c56f763a80e2ddd5 (patch)
treef9288fdfb8988a0ec31f052e89b3dfca1a632e4d /arch/um/drivers/stdio_console.c
parent[PATCH] uml: locking commentary in the random driver (diff)
downloadlinux-a52f362f864f56238c9036f5c56f763a80e2ddd5.tar.xz
linux-a52f362f864f56238c9036f5c56f763a80e2ddd5.zip
[PATCH] uml: mostly const a structure
The chan_opts structure is mostly const, and needs no locking. Comment the lack of locking on the one field that can change. Make all the other fields const. It turned out that console_open_chan didn't use its chan_opts argument, so that is deleted from the function and its callers. Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/drivers/stdio_console.c')
-rw-r--r--arch/um/drivers/stdio_console.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
index 0b1bca498049..a83c42c263b3 100644
--- a/arch/um/drivers/stdio_console.c
+++ b/arch/um/drivers/stdio_console.c
@@ -42,6 +42,7 @@ void stdio_announce(char *dev_name, int dev)
dev_name);
}
+/* Almost const, except that xterm_title may be changed in an initcall */
static struct chan_opts opts = {
.announce = stdio_announce,
.xterm_title = "Virtual Console #%d",
@@ -144,7 +145,7 @@ static int uml_console_setup(struct console *co, char *options)
{
struct line *line = &vts[co->index];
- return console_open_chan(line, co, &opts);
+ return console_open_chan(line, co);
}
static struct console stdiocons = {