diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-07-27 10:18:13 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-07-30 11:03:11 +0200 |
| commit | 37fe1d73a449bdebc4908d04e518f5852d6c453b (patch) | |
| tree | 1c42c13016f9982062718dc78fcdbc68be0b5e33 /arch/s390/mm | |
| parent | 008c2e8f247f0a8db1e8e26139da12f3a3abcda0 (diff) | |
| download | linux-stable-37fe1d73a449bdebc4908d04e518f5852d6c453b.tar.gz linux-stable-37fe1d73a449bdebc4908d04e518f5852d6c453b.tar.bz2 linux-stable-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/mm')
| -rw-r--r-- | arch/s390/mm/fault.c | 2 | ||||
| -rw-r--r-- | arch/s390/mm/pgtable.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index dc659da2fac9..5bddbe4895d5 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -111,7 +111,7 @@ static inline int user_space_fault(unsigned long trans_exc_code) if (trans_exc_code == 2) /* Access via secondary space, set_fs setting decides */ return current->thread.mm_segment.ar4; - if (user_mode == HOME_SPACE_MODE) + if (addressing_mode == HOME_SPACE_MODE) /* User space if the access has been done via home space. */ return trans_exc_code == 3; /* diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c index e9ac2d60b7e5..18df31d1f2c9 100644 --- a/arch/s390/mm/pgtable.c +++ b/arch/s390/mm/pgtable.c @@ -796,7 +796,7 @@ int s390_enable_sie(void) struct mm_struct *mm, *old_mm; /* Do we have switched amode? If no, we cannot do sie */ - if (user_mode == HOME_SPACE_MODE) + if (addressing_mode == HOME_SPACE_MODE) return -EINVAL; /* Do we have pgstes? if yes, we are done */ |