From patchwork Tue May 3 10:23:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King X-Patchwork-Id: 9002471 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 96C08BF29F for ; Tue, 3 May 2016 10:31:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A4ECC2010C for ; Tue, 3 May 2016 10:31:50 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AB0AE200E9 for ; Tue, 3 May 2016 10:31:49 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1axXbD-0003Ln-6Y; Tue, 03 May 2016 10:30:39 +0000 Received: from pandora.arm.linux.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 1axXau-0001IS-43 for linux-arm-kernel@lists.infradead.org; Tue, 03 May 2016 10:30:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=pandora-2014; h=Date:Sender:Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References:In-Reply-To; bh=9YYXtzKPhKs+zCgSOT4KWzG+G+2vVcx6NIrPbqEVp3c=; b=fQ797JgW1ax1JoupMAerh5wdyeXtHOzCOK9kdb4WSs2Xx7seSQDPW4VaZwfWfsFBJDHNm5bppcSi8Ki588wRXOpR5jTt2ysUC8tp+mu9+zyMZejvm3kwxSzrjRi0aqlNXwjY0dB2a+Y4OgooUTGCuD0nCHBHRr0JRBfE/g0mhnY=; Received: from [2001:4d48:ad52:3201:452d:3855:1c55:6d46] (port=48584 helo=e0050434b2927.dyn.arm.linux.org.uk) by pandora.arm.linux.org.uk with esmtpsa (TLSv1:DHE-RSA-AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1axXUE-0004yl-U6; Tue, 03 May 2016 11:23:27 +0100 Received: from rmk by e0050434b2927.dyn.arm.linux.org.uk with local (Exim 4.82) (envelope-from ) id 1axXU6-0004jU-At; Tue, 03 May 2016 11:23:18 +0100 In-Reply-To: References: From: Russell King To: kexec@lists.infradead.org,linux-arm-kernel@lists.infradead.org Subject: [PATCH kexec-tools 26/32] arm: rename crash_reserved_mem to crash_kernel_mem MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Tue, 03 May 2016 11:23:18 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160503_033020_774043_139180FE X-CRM114-Status: GOOD ( 18.67 ) X-Spam-Score: -5.3 (-----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pratyush Anand Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Rename crash_reserved_mem to crash_kernel_mem as we want to support multiple reserved memory ranges. Signed-off-by: Russell King Reviewed-by: Pratyush Anand --- 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; }