summaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/setup.h
diff options
context:
space:
mode:
authorHeiko Carstens2012-09-02 11:02:23 +0200
committerMartin Schwidefsky2012-09-26 15:45:05 +0200
commitd1b0d842c4450e410053083db837ef16532a4139 (patch)
tree1576b47cddbff2d898cd1c83a26ac56acba7fedf /arch/s390/include/asm/setup.h
parents390/partitions: make partition detection independent from DASD ioctls (diff)
downloadkernel-qcow2-linux-d1b0d842c4450e410053083db837ef16532a4139.tar.gz
kernel-qcow2-linux-d1b0d842c4450e410053083db837ef16532a4139.tar.xz
kernel-qcow2-linux-d1b0d842c4450e410053083db837ef16532a4139.zip
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/include/asm/setup.h')
-rw-r--r--arch/s390/include/asm/setup.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h
index 908f68871393..87b47ca954f1 100644
--- a/arch/s390/include/asm/setup.h
+++ b/arch/s390/include/asm/setup.h
@@ -60,7 +60,7 @@ void create_mem_hole(struct mem_chunk memory_chunk[], unsigned long addr,
#define SECONDARY_SPACE_MODE 2
#define HOME_SPACE_MODE 3
-extern unsigned int addressing_mode;
+extern unsigned int s390_user_mode;
/*
* Machine features detected in head.S