domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

generic: fix kexec build error for MIPS with gcc-4.6-linaro

Browse Source 
SVN-Revision: 30395
This commit is contained in:
Gabor Juhos
2012-02-09 14:06:44 +00:00
parent fa11e6e0d6
commit 31a0451cee
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/generic/patches-2.6.39/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
View File

@@ -39,7 +39,7 @@
- int i, argc = 0; - int i, argc = 0;
- char *bootloader = "kexec"; - char *bootloader = "kexec";
- int *kexec_argv = (int *)kexec_args[1]; - int *kexec_argv = (int *)kexec_args[1];
+ void __user *buf; + void __user *buf = NULL;
+ size_t bufsz; + size_t bufsz;
+ size_t size; + size_t size;
+ int i; + int i;
@@ -92,7 +92,7 @@
+ break; + break;
+ } + }
+ +
+ if (i >= image->nr_segments) + if (!buf)
+ return; + return;
+ +
+ size = KEXEC_MIPS_ARGV_BUF_SIZE - 1; + size = KEXEC_MIPS_ARGV_BUF_SIZE - 1;

4
target/linux/generic/patches-3.0/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
View File

@@ -39,7 +39,7 @@
- int i, argc = 0; - int i, argc = 0;
- char *bootloader = "kexec"; - char *bootloader = "kexec";
- int *kexec_argv = (int *)kexec_args[1]; - int *kexec_argv = (int *)kexec_args[1];
+ void __user *buf; + void __user *buf = NULL;
+ size_t bufsz; + size_t bufsz;
+ size_t size; + size_t size;
+ int i; + int i;
@@ -92,7 +92,7 @@
+ break; + break;
+ } + }
+ +
+ if (i >= image->nr_segments) + if (!buf)
+ return; + return;
+ +
+ size = KEXEC_MIPS_ARGV_BUF_SIZE - 1; + size = KEXEC_MIPS_ARGV_BUF_SIZE - 1;

4
target/linux/generic/patches-3.1/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
View File

@@ -39,7 +39,7 @@
- int i, argc = 0; - int i, argc = 0;
- char *bootloader = "kexec"; - char *bootloader = "kexec";
- int *kexec_argv = (int *)kexec_args[1]; - int *kexec_argv = (int *)kexec_args[1];
+ void __user *buf; + void __user *buf = NULL;
+ size_t bufsz; + size_t bufsz;
+ size_t size; + size_t size;
+ int i; + int i;
@@ -92,7 +92,7 @@
+ break; + break;
+ } + }
+ +
+ if (i >= image->nr_segments) + if (!buf)
+ return; + return;
+ +
+ size = KEXEC_MIPS_ARGV_BUF_SIZE - 1; + size = KEXEC_MIPS_ARGV_BUF_SIZE - 1;

4
target/linux/generic/patches-3.2/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
View File

@@ -39,7 +39,7 @@
- int i, argc = 0; - int i, argc = 0;
- char *bootloader = "kexec"; - char *bootloader = "kexec";
- int *kexec_argv = (int *)kexec_args[1]; - int *kexec_argv = (int *)kexec_args[1];
+ void __user *buf; + void __user *buf = NULL;
+ size_t bufsz; + size_t bufsz;
+ size_t size; + size_t size;
+ int i; + int i;
@@ -92,7 +92,7 @@
+ break; + break;
+ } + }
+ +
+ if (i >= image->nr_segments) + if (!buf)
+ return; + return;
+ +
+ size = KEXEC_MIPS_ARGV_BUF_SIZE - 1; + size = KEXEC_MIPS_ARGV_BUF_SIZE - 1;

4
target/linux/generic/patches-3.3/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
View File

@@ -39,7 +39,7 @@
- int i, argc = 0; - int i, argc = 0;
- char *bootloader = "kexec"; - char *bootloader = "kexec";
- int *kexec_argv = (int *)kexec_args[1]; - int *kexec_argv = (int *)kexec_args[1];
+ void __user *buf; + void __user *buf = NULL;
+ size_t bufsz; + size_t bufsz;
+ size_t size; + size_t size;
+ int i; + int i;
@@ -92,7 +92,7 @@
+ break; + break;
+ } + }
+ +
+ if (i >= image->nr_segments) + if (!buf)
+ return; + return;
+ +
+ size = KEXEC_MIPS_ARGV_BUF_SIZE - 1; + size = KEXEC_MIPS_ARGV_BUF_SIZE - 1;