From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from kirsty.vergenet.net ([202.4.237.240]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TeE47-0003m7-Go for kexec@lists.infradead.org; Fri, 30 Nov 2012 00:02:48 +0000 Date: Fri, 30 Nov 2012 09:02:44 +0900 From: Simon Horman Subject: Re: [PATCH] kexec: Fix compile errors in crashdump-mips.c Message-ID: <20121130000243.GC21935@verge.net.au> References: <1354219369-10520-1-git-send-email-ddaney.cavm@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1354219369-10520-1-git-send-email-ddaney.cavm@gmail.com> 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-bounces@lists.infradead.org Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: David Daney Cc: kexec@lists.infradead.org, ralf@linux-mips.org, David Daney On Thu, Nov 29, 2012 at 12:02:49PM -0800, David Daney wrote: > From: David Daney > > When building configured as '--host=mips64-octeon-linux-gnu' using > GCC-4.7.0 there are two compile errors, fix them. > > Signed-off-by: David Daney Thanks, is the first hunk also ok on 32bit? > --- > kexec/arch/mips/crashdump-mips.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/kexec/arch/mips/crashdump-mips.c b/kexec/arch/mips/crashdump-mips.c > index f988698..6f9f6c6 100644 > --- a/kexec/arch/mips/crashdump-mips.c > +++ b/kexec/arch/mips/crashdump-mips.c > @@ -83,7 +83,7 @@ static int get_kernel_vaddr_and_size(struct crash_elf_info *elf_info, > dbgprintf("kernel_vaddr= 0x%llx paddr %llx\n", > elf_info->kern_vaddr_start, > elf_info->kern_paddr_start); > - dbgprintf("kernel size = 0x%llx\n", elf_info->kern_size); > + dbgprintf("kernel size = 0x%lx\n", elf_info->kern_size); > return 0; > } > fprintf(stderr, "Cannot determine kernel virtual load addr and size\n"); > @@ -356,7 +356,7 @@ int load_crashdump_segments(struct kexec_info *info, char* mod_cmdline, > #ifdef __mips64 > if (arch_options.core_header_type == CORE_TYPE_ELF64) { > elf_info = &elf_info64; > - crash_create = crash_create_elf64; > + crash_create = crash_create_elf64_headers; > start_offset = 0xffffffff80000000UL; > } > #endif > -- > 1.7.11.7 > _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec