diff options
Diffstat (limited to 'arch/um/kernel/umid.c')
-rw-r--r-- | arch/um/kernel/umid.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/um/kernel/umid.c b/arch/um/kernel/umid.c index 772c7cfbd8ec..4eaee823bfd2 100644 --- a/arch/um/kernel/umid.c +++ b/arch/um/kernel/umid.c | |||
@@ -3,15 +3,13 @@ | |||
3 | * Licensed under the GPL | 3 | * Licensed under the GPL |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "linux/stddef.h" | ||
7 | #include "linux/kernel.h" | ||
8 | #include "asm/errno.h" | 6 | #include "asm/errno.h" |
9 | #include "init.h" | 7 | #include "init.h" |
10 | #include "os.h" | 8 | #include "os.h" |
11 | #include "kern.h" | 9 | #include "kern.h" |
10 | #include "linux/kernel.h" | ||
12 | 11 | ||
13 | /* Changed by set_umid_arg and umid_file_name */ | 12 | /* Changed by set_umid_arg */ |
14 | int umid_is_random = 0; | ||
15 | static int umid_inited = 0; | 13 | static int umid_inited = 0; |
16 | 14 | ||
17 | static int __init set_umid_arg(char *name, int *add) | 15 | static int __init set_umid_arg(char *name, int *add) |
@@ -22,11 +20,9 @@ static int __init set_umid_arg(char *name, int *add) | |||
22 | return 0; | 20 | return 0; |
23 | 21 | ||
24 | *add = 0; | 22 | *add = 0; |
25 | err = set_umid(name, printf); | 23 | err = set_umid(name); |
26 | if(err == -EEXIST){ | 24 | if(err == -EEXIST) |
27 | printf("umid '%s' already in use\n", name); | 25 | printf("umid '%s' already in use\n", name); |
28 | umid_is_random = 1; | ||
29 | } | ||
30 | else if(!err) | 26 | else if(!err) |
31 | umid_inited = 1; | 27 | umid_inited = 1; |
32 | 28 | ||