diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-09-02 05:02:23 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-09-26 09:45:05 -0400 |
commit | d1b0d842c4450e410053083db837ef16532a4139 (patch) | |
tree | 1576b47cddbff2d898cd1c83a26ac56acba7fedf /arch/s390/kernel/setup.c | |
parent | 46e8894786327caf52cf686e27ba0795bddfcd63 (diff) |
s390/mm: rename addressing_mode to s390_user_mode
Renaming the globally visible variable "user_mode" to "addressing_mode" in
order to fix a name clash was not a good idea. (Commit 37fe1d73 "s390/mm:
rename user_mode variable to addressing_mode")
Looking at the code after a couple of weeks one thinks: addressing mode of
what?
So rename the variable again. This time to s390_user_mode. Which hopefully
makes more sense.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/setup.c')
-rw-r--r-- | arch/s390/kernel/setup.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 39d609b582ca..555f985226f5 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c | |||
@@ -302,8 +302,8 @@ static int __init parse_vmalloc(char *arg) | |||
302 | } | 302 | } |
303 | early_param("vmalloc", parse_vmalloc); | 303 | early_param("vmalloc", parse_vmalloc); |
304 | 304 | ||
305 | unsigned int addressing_mode = PRIMARY_SPACE_MODE; | 305 | unsigned int s390_user_mode = PRIMARY_SPACE_MODE; |
306 | EXPORT_SYMBOL_GPL(addressing_mode); | 306 | EXPORT_SYMBOL_GPL(s390_user_mode); |
307 | 307 | ||
308 | static int set_amode_primary(void) | 308 | static int set_amode_primary(void) |
309 | { | 309 | { |
@@ -326,9 +326,9 @@ static int set_amode_primary(void) | |||
326 | static int __init early_parse_user_mode(char *p) | 326 | static int __init early_parse_user_mode(char *p) |
327 | { | 327 | { |
328 | if (p && strcmp(p, "primary") == 0) | 328 | if (p && strcmp(p, "primary") == 0) |
329 | addressing_mode = PRIMARY_SPACE_MODE; | 329 | s390_user_mode = PRIMARY_SPACE_MODE; |
330 | else if (!p || strcmp(p, "home") == 0) | 330 | else if (!p || strcmp(p, "home") == 0) |
331 | addressing_mode = HOME_SPACE_MODE; | 331 | s390_user_mode = HOME_SPACE_MODE; |
332 | else | 332 | else |
333 | return 1; | 333 | return 1; |
334 | return 0; | 334 | return 0; |
@@ -337,7 +337,7 @@ early_param("user_mode", early_parse_user_mode); | |||
337 | 337 | ||
338 | static void setup_addressing_mode(void) | 338 | static void setup_addressing_mode(void) |
339 | { | 339 | { |
340 | if (addressing_mode == PRIMARY_SPACE_MODE) { | 340 | if (s390_user_mode == PRIMARY_SPACE_MODE) { |
341 | if (set_amode_primary()) | 341 | if (set_amode_primary()) |
342 | pr_info("Address spaces switched, " | 342 | pr_info("Address spaces switched, " |
343 | "mvcos available\n"); | 343 | "mvcos available\n"); |