aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-04-18 15:36:30 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-04-18 15:36:30 +0000
commit2e641b13c0111180c2dc96d17c94148a65e6fd19 (patch)
tree42bb00575fd7657e8893ddac7956f25dc473155d /target/linux/generic
parente640bc8ca487d54491196f9dee64a806069a6c6f (diff)
downloadupstream-2e641b13c0111180c2dc96d17c94148a65e6fd19.tar.gz
upstream-2e641b13c0111180c2dc96d17c94148a65e6fd19.tar.bz2
upstream-2e641b13c0111180c2dc96d17c94148a65e6fd19.zip
fix 335-mips-kexec patch for all 3+ kernels
SVN-Revision: 31344
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.0/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch8
-rw-r--r--target/linux/generic/patches-3.1/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch8
-rw-r--r--target/linux/generic/patches-3.2/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch8
-rw-r--r--target/linux/generic/patches-3.3/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch8
4 files changed, 16 insertions, 16 deletions
diff --git a/target/linux/generic/patches-3.0/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch b/target/linux/generic/patches-3.0/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
index f31e767a35..f7a8eed000 100644
--- a/target/linux/generic/patches-3.0/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
+++ b/target/linux/generic/patches-3.0/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)
@@ -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;
+
diff --git a/target/linux/generic/patches-3.1/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch b/target/linux/generic/patches-3.1/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
index f31e767a35..f7a8eed000 100644
--- a/target/linux/generic/patches-3.1/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
+++ b/target/linux/generic/patches-3.1/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)
@@ -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;
+
diff --git a/target/linux/generic/patches-3.2/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch b/target/linux/generic/patches-3.2/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
index f31e767a35..f7a8eed000 100644
--- a/target/linux/generic/patches-3.2/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
+++ b/target/linux/generic/patches-3.2/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)
@@ -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;
+
diff --git a/target/linux/generic/patches-3.3/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch b/target/linux/generic/patches-3.3/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
index f31e767a35..f7a8eed000 100644
--- a/target/linux/generic/patches-3.3/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
+++ b/target/linux/generic/patches-3.3/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)
@@ -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;
+