You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From 00e75179b3b4b80e6e58d29a2bd948f97682fd00 Mon Sep 17 00:00:00 2001
|
|
From: Yousong Zhou <yszhou4tech@gmail.com>
|
|
Date: Mon, 9 Feb 2015 20:28:14 +0800
|
|
Subject: [PATCH 5/5] mips: fix warning about implicit type conversion.
|
|
|
|
Fixes the following warning.
|
|
|
|
kexec/arch/mips/kexec-elf-mips.c:161:16: warning: assignment makes integer from pointer without a cast [enabled by default]
|
|
|
|
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
|
|
---
|
|
kexec/arch/mips/kexec-elf-mips.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/kexec/arch/mips/kexec-elf-mips.c b/kexec/arch/mips/kexec-elf-mips.c
|
|
index a27d986..8a6419a 100644
|
|
--- a/kexec/arch/mips/kexec-elf-mips.c
|
|
+++ b/kexec/arch/mips/kexec-elf-mips.c
|
|
@@ -158,7 +158,7 @@ int elf_mips_load(int argc, char **argv, const char *buf, off_t len,
|
|
if (info->kexec_flags & KEXEC_ON_CRASH)
|
|
/* In case of crashdump segment[0] is kernel.
|
|
* Put cmdline just after it. */
|
|
- cmdline_addr = info->segment[0].mem +
|
|
+ cmdline_addr = (unsigned long)info->segment[0].mem +
|
|
info->segment[0].memsz;
|
|
else
|
|
cmdline_addr = 0;
|
|
--
|
|
1.7.10.4
|
|
|