s390/mem_detect: use unsigned longs

The memory detection code historically had to use unsigned long long
since the machine reported the true memory size (>4GB) even if the
virtual machine was running in ESA/390 mode.

Since the old code is gone use unsigned long everywhere and also get
rid of an unused ADDR2G define.

(this patch converts all long longs within sclp_info to longs)

There are many more possible conversions, however that can be done if
somebody touches the corresponding code.  Since people started to
convert unrelated long types to long longs because of the types within
struct sclp_info convert this now.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h
index cb691602f295ecc914e8686e8d9bc8178f07755e..5e3da0414b4779ec91cfcdef4b01ecba00f23237 100644 (file)
--- a/arch/s390/include/asm/sclp.h
+++ b/arch/s390/include/asm/sclp.h
@@ -57,12 +57,12 @@ struct sclp_info {
        unsigned int mtid;
        unsigned int mtid_cp;
        unsigned int mtid_prev;
-       unsigned long long rzm;
-       unsigned long long rnmax;
-       unsigned long long hamax;
+       unsigned long rzm;
+       unsigned long rnmax;
+       unsigned long hamax;
        unsigned int max_cores;
        unsigned long hsa_size;
-       unsigned long long facilities;
+       unsigned long facilities;
 };
 extern struct sclp_info sclp;
 

diff --git a/arch/s390/mm/mem_detect.c b/arch/s390/mm/mem_detect.c
index e00f0d5d296d0ce3dd042afcd1cd6d00b14b1f9f..d612cc3eec6a311e77cfa9a9659fe26308c6a7e6 100644 (file)
--- a/arch/s390/mm/mem_detect.c
+++ b/arch/s390/mm/mem_detect.c
@@ -14,8 +14,6 @@
 #include <asm/sclp.h>
 #include <asm/setup.h>
 
-#define ADDR2G (1ULL << 31)
-
 #define CHUNK_READ_WRITE 0
 #define CHUNK_READ_ONLY  1
 
@@ -27,15 +25,14 @@ static inline void memblock_physmem_add(phys_addr_t start, phys_addr_t size)
 
 void __init detect_memory_memblock(void)
 {
-       unsigned long long memsize, rnmax, rzm;
-       unsigned long addr, size;
+       unsigned long memsize, rnmax, rzm, addr, size;
        int type;
 
        rzm = sclp.rzm;
        rnmax = sclp.rnmax;
        memsize = rzm * rnmax;
        if (!rzm)
-               rzm = 1ULL << 17;
+               rzm = 1UL << 17;
        max_physmem_end = memsize;
        addr = 0;
        /* keep memblock lists close to the kernel */