diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 05:45:22 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 05:45:22 -0500 |
commit | a140feab42d1cfd811930ab76104559c19dfc4b0 (patch) | |
tree | 41fd871990e888dd5616a6bf1891a1ff307221df /drivers/s390/char/sclp_cmd.c | |
parent | 1075414b06109a99b0e87601e84c74a95bd45681 (diff) | |
parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) |
Merge commit 'v2.6.29-rc7' into core/locking
Diffstat (limited to 'drivers/s390/char/sclp_cmd.c')
-rw-r--r-- | drivers/s390/char/sclp_cmd.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c index 506390496416..77ab6e34a100 100644 --- a/drivers/s390/char/sclp_cmd.c +++ b/drivers/s390/char/sclp_cmd.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/memory.h> | 19 | #include <linux/memory.h> |
20 | #include <asm/chpid.h> | 20 | #include <asm/chpid.h> |
21 | #include <asm/sclp.h> | 21 | #include <asm/sclp.h> |
22 | #include <asm/setup.h> | ||
22 | 23 | ||
23 | #include "sclp.h" | 24 | #include "sclp.h" |
24 | 25 | ||
@@ -474,6 +475,10 @@ static void __init add_memory_merged(u16 rn) | |||
474 | goto skip_add; | 475 | goto skip_add; |
475 | if (start + size > VMEM_MAX_PHYS) | 476 | if (start + size > VMEM_MAX_PHYS) |
476 | size = VMEM_MAX_PHYS - start; | 477 | size = VMEM_MAX_PHYS - start; |
478 | if (memory_end_set && (start >= memory_end)) | ||
479 | goto skip_add; | ||
480 | if (memory_end_set && (start + size > memory_end)) | ||
481 | size = memory_end - start; | ||
477 | add_memory(0, start, size); | 482 | add_memory(0, start, size); |
478 | skip_add: | 483 | skip_add: |
479 | first_rn = rn; | 484 | first_rn = rn; |