summaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/setup.h
diff options
context:
space:
mode:
authorHeiko Carstens2012-07-27 10:18:13 +0200
committerMartin Schwidefsky2012-07-30 11:03:11 +0200
commit37fe1d73a449bdebc4908d04e518f5852d6c453b (patch)
tree1c42c13016f9982062718dc78fcdbc68be0b5e33 /arch/s390/include/asm/setup.h
parents390/mm: fix fault handling for page table walk case (diff)
downloadkernel-qcow2-linux-37fe1d73a449bdebc4908d04e518f5852d6c453b.tar.gz
kernel-qcow2-linux-37fe1d73a449bdebc4908d04e518f5852d6c453b.tar.xz
kernel-qcow2-linux-37fe1d73a449bdebc4908d04e518f5852d6c453b.zip
s390/mm: rename user_mode variable to addressing_mode
Fix name clash with user_mode() define which is also used in common code. 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 57e80534375a..e6859d16ee2d 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 user_mode;
+extern unsigned int addressing_mode;
/*
* Machine features detected in head.S