summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-2.6.39
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-03-02 13:19:13 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-03-02 13:19:13 +0000
commit7f8838066413a00211c694b73c43696336929064 (patch)
treeca03f606e981f652a1ff0ec1ef7018d67570c115 /target/linux/generic/patches-2.6.39
parentc31b59776314074d40a6082bedd8164ab1cee58c (diff)
downloadmtk-20170518-7f8838066413a00211c694b73c43696336929064.zip
mtk-20170518-7f8838066413a00211c694b73c43696336929064.tar.gz
mtk-20170518-7f8838066413a00211c694b73c43696336929064.tar.bz2
MIPS: fix kexec build on 64-bits targets
SVN-Revision: 30785
Diffstat (limited to 'target/linux/generic/patches-2.6.39')
-rw-r--r--target/linux/generic/patches-2.6.39/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-2.6.39/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch b/target/linux/generic/patches-2.6.39/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
index 3df7b0b..f7a8eed 100644
--- a/target/linux/generic/patches-2.6.39/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
+++ b/target/linux/generic/patches-2.6.39/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
@@ -9,7 +9,7 @@
+#define KEXEC_MIPS_ARGV_MAX_ARGS (COMMAND_LINE_SIZE / 15)
+
+char kexec_argv_buf[KEXEC_MIPS_ARGV_BUF_SIZE] __kexec;
-+int kexec_argv[KEXEC_MIPS_ARGV_MAX_ARGS] __kexec;
++char *kexec_argv[KEXEC_MIPS_ARGV_MAX_ARGS] __kexec;
+
+static void
+machine_kexec_print_args(void)
@@ -28,7 +28,7 @@
-#define ARGV_MAX_ARGS (COMMAND_LINE_SIZE / 15)
+ for (i = 0; i < kexec_args[0]; i++)
-+ pr_info("kexec_argv[%zd] = %p, %s\n", i,
++ pr_info("kexec_argv[%d] = %p, %s\n", i,
+ (char *)kexec_argv[i], (char *)kexec_argv[i]);
+}
@@ -98,7 +98,7 @@
+ size = KEXEC_MIPS_ARGV_BUF_SIZE - 1;
+ size = min(size, bufsz);
+ if (size < bufsz)
-+ pr_warn("kexec command line truncated to %d bytes\n", size);
++ pr_warn("kexec command line truncated to %zd bytes\n", size);
+
+ /* Copy to kernel space */
+ copy_from_user(kexec_argv_buf, buf, size);
@@ -126,7 +126,7 @@
+ continue;
}
+
-+ kexec_argv[argc++] = (int) ptr;
++ kexec_argv[argc++] = ptr;
+ ptr = strchr(ptr, ' ');
}
@@ -138,7 +138,7 @@
- return 0;
+ kexec_args[0] = argc;
-+ kexec_args[1] = (int) kexec_argv;
++ kexec_args[1] = (unsigned long)kexec_argv;
+ kexec_args[2] = 0;
+ kexec_args[3] = 0;
+