diff options
| author | Michael Holzheu <holzheu@linux.vnet.ibm.com> | 2013-03-08 09:29:34 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-03-11 09:59:06 +0100 |
| commit | 52319b457cd78aa891f5947cf2237dd5f6a4c52d (patch) | |
| tree | 3f173a837cf0734389905d8ce6722c3b94330801 /drivers/s390 | |
| parent | drivers/i2c: remove !S390 dependency, add missing GENERIC_HARDIRQS dependencies (diff) | |
| download | linux-52319b457cd78aa891f5947cf2237dd5f6a4c52d.tar.xz linux-52319b457cd78aa891f5947cf2237dd5f6a4c52d.zip | |
s390/kdump: Do not add standby memory for kdump
Standby memory that is located outside [0,OLDMEM_SIZE] is currently used
by the s390 memory detection. This leads to additional memory consumption
due to allocation of page structures. To fix this, we now do not
add standby memory if the kernel is started in kdump mode.
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/char/sclp_cmd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c index 30a2255389e5..cd798386b622 100644 --- a/drivers/s390/char/sclp_cmd.c +++ b/drivers/s390/char/sclp_cmd.c @@ -627,6 +627,8 @@ static int __init sclp_detect_standby_memory(void) struct read_storage_sccb *sccb; int i, id, assigned, rc; + if (OLDMEM_BASE) /* No standby memory in kdump mode */ + return 0; if (!early_read_info_sccb_valid) return 0; if ((sclp_facilities & 0xe00000000000ULL) != 0xe00000000000ULL) |