[PATCH] kexec: Fix compile errors in crashdump-mips.c

[PATCH] kexec: Fix compile errors in crashdump-mips.c

[David Daney]

From: David Daney <david.daney@cavium.com>

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 <david.daney@cavium.com>
---
 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

Re: [PATCH] kexec: Fix compile errors in crashdump-mips.c

[Simon Horman]

On Thu, Nov 29, 2012 at 12:02:49PM -0800, David Daney wrote:
> From: David Daney <david.daney@cavium.com>
> 
> 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 <david.daney@cavium.com>

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

Re: [PATCH] kexec: Fix compile errors in crashdump-mips.c

[David Daney]

On 11/29/2012 04:02 PM, Simon Horman wrote:
> On Thu, Nov 29, 2012 at 12:02:49PM -0800, David Daney wrote:
>> From: David Daney <david.daney@cavium.com>
>>
>> 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 <david.daney@cavium.com>
>
> Thanks, is the first hunk also ok on 32bit?

Yes,  in crashdump.h kern_size is declared as type unsigned long, so the 
proper printf format is ABI independent and should be "%lx"

>
>> ---
>>   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

Re: [PATCH] kexec: Fix compile errors in crashdump-mips.c

[Simon Horman]

On Thu, Nov 29, 2012 at 04:12:38PM -0800, David Daney wrote:
> On 11/29/2012 04:02 PM, Simon Horman wrote:
> >On Thu, Nov 29, 2012 at 12:02:49PM -0800, David Daney wrote:
> >>From: David Daney <david.daney@cavium.com>
> >>
> >>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 <david.daney@cavium.com>
> >
> >Thanks, is the first hunk also ok on 32bit?
> 
> Yes,  in crashdump.h kern_size is declared as type unsigned long, so
> the proper printf format is ABI independent and should be "%lx"

Thanks, applied.

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec