diff options
| author | Vasily Gorbik <gor@linux.ibm.com> | 2018-04-11 20:15:24 +0300 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-10-09 12:21:12 +0300 |
| commit | 54c57795e848100a2502b7a39b12b784292f4576 (patch) | |
| tree | ae93ff66373017b80bbeecd2bc74aa5e04746246 /arch/s390/include | |
| parent | cd45c995610420755c5fe0d09afee3106c586e26 (diff) | |
| download | linux-54c57795e848100a2502b7a39b12b784292f4576.tar.xz | |
s390/mem_detect: replace tprot loop with binary search
In a situation when other memory detection methods are not available
(no SCLP and no z/VM diag260), continuous online memory is assumed.
Replacing tprot loop with faster binary search, as only online memory
end has to be found.
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Reviewed-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/mem_detect.h | 2 | ||||
| -rw-r--r-- | arch/s390/include/asm/sclp.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/include/asm/mem_detect.h b/arch/s390/include/asm/mem_detect.h index 153c3542fa8a..6114b92ab667 100644 --- a/arch/s390/include/asm/mem_detect.h +++ b/arch/s390/include/asm/mem_detect.h @@ -9,7 +9,7 @@ enum mem_info_source { MEM_DETECT_SCLP_STOR_INFO, MEM_DETECT_DIAG260, MEM_DETECT_SCLP_READ_INFO, - MEM_DETECT_TPROT_LOOP + MEM_DETECT_BIN_SEARCH }; struct mem_detect_block { diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h index e0da13c0ef79..32b683f6992f 100644 --- a/arch/s390/include/asm/sclp.h +++ b/arch/s390/include/asm/sclp.h @@ -114,7 +114,7 @@ void sclp_early_printk(const char *s); void sclp_early_printk_force(const char *s); void __sclp_early_printk(const char *s, unsigned int len, unsigned int force); -int sclp_early_get_meminfo(unsigned long *mem, unsigned long *rzm); +int sclp_early_get_memsize(unsigned long *mem); int _sclp_get_core_info(struct sclp_core_info *info); int sclp_core_configure(u8 core); int sclp_core_deconfigure(u8 core); |