aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-02-09 14:06:44 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-02-09 14:06:44 +0000
commit31a0451cee20c2aa994f3521de0942bf9bf7ddaa (patch)
tree257e8bb981b354f15c37d94f4a7b2c4dbb6ff9b1 /target
parentfa11e6e0d69df250b80122238b1600500ba59c2d (diff)
downloadupstream-31a0451cee20c2aa994f3521de0942bf9bf7ddaa.tar.gz
upstream-31a0451cee20c2aa994f3521de0942bf9bf7ddaa.tar.bz2
upstream-31a0451cee20c2aa994f3521de0942bf9bf7ddaa.zip
generic: fix kexec build error for MIPS with gcc-4.6-linaro
SVN-Revision: 30395
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/patches-2.6.39/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch4
-rw-r--r--target/linux/generic/patches-3.0/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch4
-rw-r--r--target/linux/generic/patches-3.1/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch4
-rw-r--r--target/linux/generic/patches-3.2/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch4
-rw-r--r--target/linux/generic/patches-3.3/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch4
5 files changed, 10 insertions, 10 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 abc89712ba..f31e767a35 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
@@ -39,7 +39,7 @@
- int i, argc = 0;
- char *bootloader = "kexec";
- int *kexec_argv = (int *)kexec_args[1];
-+ void __user *buf;
++ void __user *buf = NULL;
+ size_t bufsz;
+ size_t size;
+ int i;
@@ -92,7 +92,7 @@
+ break;
+ }
+
-+ if (i >= image->nr_segments)
++ if (!buf)
+ return;
+
+ size = KEXEC_MIPS_ARGV_BUF_SIZE - 1;
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 abc89712ba..f31e767a35 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
@@ -39,7 +39,7 @@
- int i, argc = 0;
- char *bootloader = "kexec";
- int *kexec_argv = (int *)kexec_args[1];
-+ void __user *buf;
++ void __user *buf = NULL;
+ size_t bufsz;
+ size_t size;
+ int i;
@@ -92,7 +92,7 @@
+ break;
+ }
+
-+ if (i >= image->nr_segments)
++ if (!buf)
+ return;
+
+ size = KEXEC_MIPS_ARGV_BUF_SIZE - 1;
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 abc89712ba..f31e767a35 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
@@ -39,7 +39,7 @@
- int i, argc = 0;
- char *bootloader = "kexec";
- int *kexec_argv = (int *)kexec_args[1];
-+ void __user *buf;
++ void __user *buf = NULL;
+ size_t bufsz;
+ size_t size;
+ int i;
@@ -92,7 +92,7 @@
+ break;
+ }
+
-+ if (i >= image->nr_segments)
++ if (!buf)
+ return;
+
+ size = KEXEC_MIPS_ARGV_BUF_SIZE - 1;
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 abc89712ba..f31e767a35 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
@@ -39,7 +39,7 @@
- int i, argc = 0;
- char *bootloader = "kexec";
- int *kexec_argv = (int *)kexec_args[1];
-+ void __user *buf;
++ void __user *buf = NULL;
+ size_t bufsz;
+ size_t size;
+ int i;
@@ -92,7 +92,7 @@
+ break;
+ }
+
-+ if (i >= image->nr_segments)
++ if (!buf)
+ return;
+
+ size = KEXEC_MIPS_ARGV_BUF_SIZE - 1;
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 abc89712ba..f31e767a35 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
@@ -39,7 +39,7 @@
- int i, argc = 0;
- char *bootloader = "kexec";
- int *kexec_argv = (int *)kexec_args[1];
-+ void __user *buf;
++ void __user *buf = NULL;
+ size_t bufsz;
+ size_t size;
+ int i;
@@ -92,7 +92,7 @@
+ break;
+ }
+
-+ if (i >= image->nr_segments)
++ if (!buf)
+ return;
+
+ size = KEXEC_MIPS_ARGV_BUF_SIZE - 1;