On 01/05/16 at 11:54am, Toshi Kani wrote: > Set IORESOURCE_SYSTEM_RAM to 'flags' and IORES_DESC_CRASH_KERNEL > to 'desc' of "Crash kernel" resource ranges, which are child > nodes of System RAM. > > Change crash_shrink_memory() to set IORESOURCE_SYSTEM_RAM for > a System RAM range. > > Change kexec_add_buffer() to call walk_iomem_res() with > IORESOURCE_SYSTEM_RAM type for "Crash kernel". > > Cc: Andrew Morton <[email protected]> > Cc: Dave Young <[email protected]> > Cc: [email protected] > Signed-off-by: Toshi Kani <[email protected]> > --- > kernel/kexec_core.c | 8 +++++--- > kernel/kexec_file.c | 2 +- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c > index 11b64a6..80bff05 100644 > --- a/kernel/kexec_core.c > +++ b/kernel/kexec_core.c > @@ -66,13 +66,15 @@ struct resource crashk_res = { > .name = "Crash kernel", > .start = 0, > .end = 0, > - .flags = IORESOURCE_BUSY | IORESOURCE_MEM > + .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM, > + .desc = IORES_DESC_CRASH_KERNEL > }; > struct resource crashk_low_res = { > .name = "Crash kernel", > .start = 0, > .end = 0, > - .flags = IORESOURCE_BUSY | IORESOURCE_MEM > + .flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM, > + .desc = IORES_DESC_CRASH_KERNEL > }; > > int kexec_should_crash(struct task_struct *p) > @@ -934,7 +936,7 @@ int crash_shrink_memory(unsigned long new_size) > > ram_res->start = end; > ram_res->end = crashk_res.end; > - ram_res->flags = IORESOURCE_BUSY | IORESOURCE_MEM; > + ram_res->flags = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM; > ram_res->name = "System RAM"; > > crashk_res.end = end - 1; > diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c > index b70ada0..c245085 100644 > --- a/kernel/kexec_file.c > +++ b/kernel/kexec_file.c > @@ -523,7 +523,7 @@ int kexec_add_buffer(struct kimage *image, char *buffer, > unsigned long bufsz, > /* Walk the RAM ranges and allocate a suitable range for the buffer */ > if (image->type == KEXEC_TYPE_CRASH) > ret = walk_iomem_res("Crash kernel", > - IORESOURCE_MEM | IORESOURCE_BUSY, > + IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY, > crashk_res.start, crashk_res.end, kbuf, > locate_mem_hole_callback); > else
Reviewed-by: Dave Young <[email protected]> Thanks Dave -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
