diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-02-10 10:44:25 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 19:51:24 +0100 |
| commit | de5fe76e436d9e98f8af8005ff23a2e6066aea10 (patch) | |
| tree | f4d5672caab38f21f19bc18ac348387b363a9ec1 /arch/um/kernel | |
| parent | [PATCH] uml: SIGIO formatting fixes (diff) | |
| download | linux-de5fe76e436d9e98f8af8005ff23a2e6066aea10.tar.xz linux-de5fe76e436d9e98f8af8005ff23a2e6066aea10.zip | |
[PATCH] uml: umid tidying
Add an error message when two umids are put on the command line.
umid.h is kind of pointless since it only declares one thing, and that
is already declared in os.h.
Commented the lack of locking of some data in os-Linux/umid.h.
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/kernel')
| -rw-r--r-- | arch/um/kernel/um_arch.c | 1 | ||||
| -rw-r--r-- | arch/um/kernel/umid.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 66f43c906821..84e57f6da1d3 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c @@ -30,7 +30,6 @@ #include "kern.h" #include "mem_user.h" #include "mem.h" -#include "umid.h" #include "initrd.h" #include "init.h" #include "os.h" diff --git a/arch/um/kernel/umid.c b/arch/um/kernel/umid.c index 4eaee823bfd2..039e16efcd55 100644 --- a/arch/um/kernel/umid.c +++ b/arch/um/kernel/umid.c @@ -16,8 +16,10 @@ static int __init set_umid_arg(char *name, int *add) { int err; - if(umid_inited) + if(umid_inited){ + printf("umid already set\n"); return 0; + } *add = 0; err = set_umid(name); |