diff options
author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2005-10-09 15:37:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-10 11:36:00 -0400 |
commit | 9e3d862e5c341c59b673c9cadd64210ca03cb41e (patch) | |
tree | 6360de02f760802ee749ed7998a19b92e18d3a5c /arch/um/os-Linux | |
parent | 5cd10daa0c7fc1410e1c0d685cbc9622c769eb16 (diff) |
[PATCH] uml: add mode=skas0 as a synonym of skas0
Too many people were confused by skas0 and tried using "mode=skas0". And after
all, they are right - accept this.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/os-Linux')
-rw-r--r-- | arch/um/os-Linux/start_up.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c index 6af83171ca4e..b99ab414542f 100644 --- a/arch/um/os-Linux/start_up.c +++ b/arch/um/os-Linux/start_up.c | |||
@@ -143,11 +143,22 @@ static int __init skas0_cmd_param(char *str, int* add) | |||
143 | return 0; | 143 | return 0; |
144 | } | 144 | } |
145 | 145 | ||
146 | /* The two __uml_setup would conflict, without this stupid alias. */ | ||
147 | |||
148 | static int __init mode_skas0_cmd_param(char *str, int* add) | ||
149 | __attribute__((alias("skas0_cmd_param"))); | ||
150 | |||
146 | __uml_setup("skas0", skas0_cmd_param, | 151 | __uml_setup("skas0", skas0_cmd_param, |
147 | "skas0\n" | 152 | "skas0\n" |
148 | " Disables SKAS3 usage, so that SKAS0 is used, unless \n" | 153 | " Disables SKAS3 usage, so that SKAS0 is used, unless \n" |
149 | " you specify mode=tt.\n\n"); | 154 | " you specify mode=tt.\n\n"); |
150 | 155 | ||
156 | __uml_setup("mode=skas0", mode_skas0_cmd_param, | ||
157 | "mode=skas0\n" | ||
158 | " Disables SKAS3 usage, so that SKAS0 is used, unless you \n" | ||
159 | " specify mode=tt. Note that this was recently added - on \n" | ||
160 | " older kernels you must use simply \"skas0\".\n\n"); | ||
161 | |||
151 | static int force_sysemu_disabled = 0; | 162 | static int force_sysemu_disabled = 0; |
152 | 163 | ||
153 | static int __init nosysemu_cmd_param(char *str, int* add) | 164 | static int __init nosysemu_cmd_param(char *str, int* add) |