diff options
| author | Jeff Dike | 2007-02-10 01:44:06 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2007-02-11 10:51:22 -0800 |
| commit | a52f362f864f56238c9036f5c56f763a80e2ddd5 (patch) | |
| tree | f9288fdfb8988a0ec31f052e89b3dfca1a632e4d /arch/um/include | |
| parent | 99b0278f95fc9d55adf65133dc678167a88b632a (diff) | |
[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/include')
| -rw-r--r-- | arch/um/include/chan_kern.h | 3 | ||||
| -rw-r--r-- | arch/um/include/chan_user.h | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/arch/um/include/chan_kern.h b/arch/um/include/chan_kern.h index 2d9aa7ef4c27..c4b41bb1035f 100644 --- a/arch/um/include/chan_kern.h +++ b/arch/um/include/chan_kern.h @@ -36,8 +36,7 @@ extern int write_chan(struct list_head *chans, const char *buf, int len, int write_irq); extern int console_write_chan(struct list_head *chans, const char *buf, int len); -extern int console_open_chan(struct line *line, struct console *co, - const struct chan_opts *opts); +extern int console_open_chan(struct line *line, struct console *co); extern void deactivate_chan(struct list_head *chans, int irq); extern void reactivate_chan(struct list_head *chans, int irq); extern void chan_enable_winch(struct list_head *chans, struct tty_struct *tty); diff --git a/arch/um/include/chan_user.h b/arch/um/include/chan_user.h index a795547a1dbd..ad671eb9edeb 100644 --- a/arch/um/include/chan_user.h +++ b/arch/um/include/chan_user.h @@ -9,11 +9,11 @@ #include "init.h" struct chan_opts { - void (*announce)(char *dev_name, int dev); + void (*const announce)(char *dev_name, int dev); char *xterm_title; - int raw; - unsigned long tramp_stack; - int in_kernel; + const int raw; + const unsigned long tramp_stack; + const int in_kernel; }; enum chan_init_pri { INIT_STATIC, INIT_ALL, INIT_ONE }; |