diff options
| author | Michael Neuling <mikey@neuling.org> | 2007-04-26 16:50:34 +1000 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-02-27 12:29:21 +0900 |
| commit | 8cfe9008523f7459aea9275e6c2f57e2948890e5 (patch) | |
| tree | ffb6ca4878bfe58f63954c29837c30a8dd7b1e14 /kexec/kexec.c | |
| parent | cc42aa5f2a579637d9126328b35c9920fbc86095 (diff) | |
fix valid_memory_range region merging
Check the next region we are including is type RANGE_RAM as well.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec/kexec.c')
| -rw-r--r-- | kexec/kexec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kexec/kexec.c b/kexec/kexec.c index 4094dd7..c4d2a30 100644 --- a/kexec/kexec.c +++ b/kexec/kexec.c @@ -99,7 +99,8 @@ int valid_memory_range(struct kexec_info *info, mstart = info->memory_range[i].start; mend = info->memory_range[i].end; if (i < info->memory_ranges - 1 - && mend == info->memory_range[i+1].start) + && mend == info->memory_range[i+1].start + && info->memory_range[i+1].type == RANGE_RAM) mend = info->memory_range[i+1].end; /* Check to see if we are fully contained */ |