From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmk@arm.linux.org.uk (Russell King) Date: Mon, 06 Jun 2016 18:00:57 +0100 Subject: [PATCH kexec-tools v2 26/32] arm: rename crash_reserved_mem to crash_kernel_mem In-Reply-To: <20160606164129.GM1041@n2100.armlinux.org.uk> References: <20160606164129.GM1041@n2100.armlinux.org.uk> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Rename crash_reserved_mem to crash_kernel_mem as we want to support multiple reserved memory ranges. Reviewed-by: Pratyush Anand Signed-off-by: Russell King --- kexec/arch/arm/crashdump-arm.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c index f2e6a0d..1a6ab88 100644 --- a/kexec/arch/arm/crashdump-arm.c +++ b/kexec/arch/arm/crashdump-arm.c @@ -53,7 +53,7 @@ struct memory_ranges usablemem_rgns = { }; /* memory range reserved for crashkernel */ -static struct memory_range crash_reserved_mem; +static struct memory_range crash_kernel_mem; static struct crash_elf_info elf_info = { .class = ELFCLASS32, @@ -140,7 +140,7 @@ static int get_kernel_page_offset(struct kexec_info *info, */ static void crash_exclude_range(void) { - const struct memory_range *range = &crash_reserved_mem; + const struct memory_range *range = &crash_kernel_mem; int i; for (i = 0; i < usablemem_rgns.size; i++) { @@ -262,8 +262,8 @@ static void dump_memory_ranges(void) return; dbgprintf("crashkernel: [%#llx - %#llx] (%ldM)\n", - crash_reserved_mem.start, crash_reserved_mem.end, - (unsigned long)range_size(&crash_reserved_mem) >> 20); + crash_kernel_mem.start, crash_kernel_mem.end, + (unsigned long)range_size(&crash_kernel_mem) >> 20); for (i = 0; i < usablemem_rgns.size; i++) { struct memory_range *r = usablemem_rgns.ranges + i; @@ -313,10 +313,10 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) * Ensure that the crash kernel memory range is sane. The crash kernel * must be located within memory which is visible during booting. */ - if (crash_reserved_mem.end > ARM_MAX_VIRTUAL) { + if (crash_kernel_mem.end > ARM_MAX_VIRTUAL) { fprintf(stderr, "Crash kernel memory [0x%llx-0x%llx] is inaccessible at boot - unable to load crash kernel\n", - crash_reserved_mem.start, crash_reserved_mem.end); + crash_kernel_mem.start, crash_kernel_mem.end); return -1; } @@ -349,8 +349,8 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) * regions to be aligned to SECTION_SIZE. */ elfcorehdr = add_buffer_phys_virt(info, buf, bufsz, bufsz, 1 << 20, - crash_reserved_mem.start, - crash_reserved_mem.end, -1, 0); + crash_kernel_mem.start, + crash_kernel_mem.end, -1, 0); dbgprintf("elfcorehdr: %#lx\n", elfcorehdr); cmdline_add_elfcorehdr(mod_cmdline, elfcorehdr); @@ -360,7 +360,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) * prevents the dump capture kernel from using any other memory regions * which belong to the primary kernel. */ - cmdline_add_mem(mod_cmdline, elfcorehdr - crash_reserved_mem.start); + cmdline_add_mem(mod_cmdline, elfcorehdr - crash_kernel_mem.start); dump_memory_ranges(); dbgprintf("kernel command line: \"%s\"\n", mod_cmdline); @@ -377,7 +377,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) * @length: size of the memory region * * This function is called for each memory range in /proc/iomem, stores - * the location of the crash kernel range into @crash_reserved_mem, and + * the location of the crash kernel range into @crash_kernel_mem, and * stores the system RAM into @usablemem_rgns. */ static int iomem_range_callback(void *UNUSED(data), int UNUSED(nr), @@ -385,9 +385,9 @@ static int iomem_range_callback(void *UNUSED(data), int UNUSED(nr), unsigned long long length) { if (strncmp(str, CRASH_KERNEL, strlen(CRASH_KERNEL)) == 0) { - crash_reserved_mem.start = base; - crash_reserved_mem.end = base + length - 1; - crash_reserved_mem.type = RANGE_RAM; + crash_kernel_mem.start = base; + crash_kernel_mem.end = base + length - 1; + crash_kernel_mem.type = RANGE_RAM; } else if (strncmp(str, SYSTEM_RAM, strlen(SYSTEM_RAM)) == 0) { return mem_regions_add(&usablemem_rgns, @@ -407,5 +407,5 @@ int is_crashkernel_mem_reserved(void) { kexec_iomem_for_each_line(NULL, iomem_range_callback, NULL); - return crash_reserved_mem.start != crash_reserved_mem.end; + return crash_kernel_mem.start != crash_kernel_mem.end; } -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b9y30-0006I2-MO for kexec@lists.infradead.org; Mon, 06 Jun 2016 17:10:45 +0000 In-Reply-To: <20160606164129.GM1041@n2100.armlinux.org.uk> References: <20160606164129.GM1041@n2100.armlinux.org.uk> From: Russell King Subject: [PATCH kexec-tools v2 26/32] arm: rename crash_reserved_mem to crash_kernel_mem MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 06 Jun 2016 18:00:57 +0100 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org Cc: Pratyush Anand , Baoquan He Rename crash_reserved_mem to crash_kernel_mem as we want to support multiple reserved memory ranges. Reviewed-by: Pratyush Anand Signed-off-by: Russell King --- kexec/arch/arm/crashdump-arm.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c index f2e6a0d..1a6ab88 100644 --- a/kexec/arch/arm/crashdump-arm.c +++ b/kexec/arch/arm/crashdump-arm.c @@ -53,7 +53,7 @@ struct memory_ranges usablemem_rgns = { }; /* memory range reserved for crashkernel */ -static struct memory_range crash_reserved_mem; +static struct memory_range crash_kernel_mem; static struct crash_elf_info elf_info = { .class = ELFCLASS32, @@ -140,7 +140,7 @@ static int get_kernel_page_offset(struct kexec_info *info, */ static void crash_exclude_range(void) { - const struct memory_range *range = &crash_reserved_mem; + const struct memory_range *range = &crash_kernel_mem; int i; for (i = 0; i < usablemem_rgns.size; i++) { @@ -262,8 +262,8 @@ static void dump_memory_ranges(void) return; dbgprintf("crashkernel: [%#llx - %#llx] (%ldM)\n", - crash_reserved_mem.start, crash_reserved_mem.end, - (unsigned long)range_size(&crash_reserved_mem) >> 20); + crash_kernel_mem.start, crash_kernel_mem.end, + (unsigned long)range_size(&crash_kernel_mem) >> 20); for (i = 0; i < usablemem_rgns.size; i++) { struct memory_range *r = usablemem_rgns.ranges + i; @@ -313,10 +313,10 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) * Ensure that the crash kernel memory range is sane. The crash kernel * must be located within memory which is visible during booting. */ - if (crash_reserved_mem.end > ARM_MAX_VIRTUAL) { + if (crash_kernel_mem.end > ARM_MAX_VIRTUAL) { fprintf(stderr, "Crash kernel memory [0x%llx-0x%llx] is inaccessible at boot - unable to load crash kernel\n", - crash_reserved_mem.start, crash_reserved_mem.end); + crash_kernel_mem.start, crash_kernel_mem.end); return -1; } @@ -349,8 +349,8 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) * regions to be aligned to SECTION_SIZE. */ elfcorehdr = add_buffer_phys_virt(info, buf, bufsz, bufsz, 1 << 20, - crash_reserved_mem.start, - crash_reserved_mem.end, -1, 0); + crash_kernel_mem.start, + crash_kernel_mem.end, -1, 0); dbgprintf("elfcorehdr: %#lx\n", elfcorehdr); cmdline_add_elfcorehdr(mod_cmdline, elfcorehdr); @@ -360,7 +360,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) * prevents the dump capture kernel from using any other memory regions * which belong to the primary kernel. */ - cmdline_add_mem(mod_cmdline, elfcorehdr - crash_reserved_mem.start); + cmdline_add_mem(mod_cmdline, elfcorehdr - crash_kernel_mem.start); dump_memory_ranges(); dbgprintf("kernel command line: \"%s\"\n", mod_cmdline); @@ -377,7 +377,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) * @length: size of the memory region * * This function is called for each memory range in /proc/iomem, stores - * the location of the crash kernel range into @crash_reserved_mem, and + * the location of the crash kernel range into @crash_kernel_mem, and * stores the system RAM into @usablemem_rgns. */ static int iomem_range_callback(void *UNUSED(data), int UNUSED(nr), @@ -385,9 +385,9 @@ static int iomem_range_callback(void *UNUSED(data), int UNUSED(nr), unsigned long long length) { if (strncmp(str, CRASH_KERNEL, strlen(CRASH_KERNEL)) == 0) { - crash_reserved_mem.start = base; - crash_reserved_mem.end = base + length - 1; - crash_reserved_mem.type = RANGE_RAM; + crash_kernel_mem.start = base; + crash_kernel_mem.end = base + length - 1; + crash_kernel_mem.type = RANGE_RAM; } else if (strncmp(str, SYSTEM_RAM, strlen(SYSTEM_RAM)) == 0) { return mem_regions_add(&usablemem_rgns, @@ -407,5 +407,5 @@ int is_crashkernel_mem_reserved(void) { kexec_iomem_for_each_line(NULL, iomem_range_callback, NULL); - return crash_reserved_mem.start != crash_reserved_mem.end; + return crash_kernel_mem.start != crash_kernel_mem.end; } -- 1.9.1 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec