diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 13:05:37 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 13:05:37 -0400 |
| commit | 2849a3a945d0e440fa245c47c49c80ef1cc103c3 (patch) | |
| tree | 616868130f4b8a063cfa1c138135c10247a4da0e /drivers/s390/char/sclp_cmd.c | |
| parent | 417c765af914106f5e76c4e0181dd555fe6a89a0 (diff) | |
| parent | 8bb9660418e05bb1845ac1a2428444d78e322cc7 (diff) | |
Merge 3.9-rc4 into usb-next
This picks up the fixes we had for USB in 3.9-rc4
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/s390/char/sclp_cmd.c')
| -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) | |||
| 627 | struct read_storage_sccb *sccb; | 627 | struct read_storage_sccb *sccb; |
| 628 | int i, id, assigned, rc; | 628 | int i, id, assigned, rc; |
| 629 | 629 | ||
| 630 | if (OLDMEM_BASE) /* No standby memory in kdump mode */ | ||
| 631 | return 0; | ||
| 630 | if (!early_read_info_sccb_valid) | 632 | if (!early_read_info_sccb_valid) |
| 631 | return 0; | 633 | return 0; |
| 632 | if ((sclp_facilities & 0xe00000000000ULL) != 0xe00000000000ULL) | 634 | if ((sclp_facilities & 0xe00000000000ULL) != 0xe00000000000ULL) |