diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-05-23 10:24:51 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-05-24 04:10:10 -0400 |
commit | f4815ac6c935b8e441fe12504d62e0e8ff7f7ce5 (patch) | |
tree | 32b78252b6b155e7a218c571d9e994c78da1aee0 /arch/s390/mm/vmem.c | |
parent | da477737c5ec99d37cb78dab909aa0402a0ebf18 (diff) |
s390/headers: replace __s390x__ with CONFIG_64BIT where possible
Replace __s390x__ with CONFIG_64BIT in all places that are not exported
to userspace or guarded with #ifdef __KERNEL__.
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/vmem.c')
-rw-r--r-- | arch/s390/mm/vmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c index 4799383e2df9..71ae20df674e 100644 --- a/arch/s390/mm/vmem.c +++ b/arch/s390/mm/vmem.c | |||
@@ -109,7 +109,7 @@ static int vmem_add_mem(unsigned long start, unsigned long size, int ro) | |||
109 | pte = mk_pte_phys(address, __pgprot(ro ? _PAGE_RO : 0)); | 109 | pte = mk_pte_phys(address, __pgprot(ro ? _PAGE_RO : 0)); |
110 | pm_dir = pmd_offset(pu_dir, address); | 110 | pm_dir = pmd_offset(pu_dir, address); |
111 | 111 | ||
112 | #ifdef __s390x__ | 112 | #ifdef CONFIG_64BIT |
113 | if (MACHINE_HAS_HPAGE && !(address & ~HPAGE_MASK) && | 113 | if (MACHINE_HAS_HPAGE && !(address & ~HPAGE_MASK) && |
114 | (address + HPAGE_SIZE <= start + size) && | 114 | (address + HPAGE_SIZE <= start + size) && |
115 | (address >= HPAGE_SIZE)) { | 115 | (address >= HPAGE_SIZE)) { |