diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-02-09 14:06:44 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-02-09 14:06:44 +0000 |
| commit | 31a0451cee20c2aa994f3521de0942bf9bf7ddaa (patch) | |
| tree | 257e8bb981b354f15c37d94f4a7b2c4dbb6ff9b1 /target/linux/generic/patches-2.6.39 | |
| parent | fa11e6e0d69df250b80122238b1600500ba59c2d (diff) | |
| download | upstream-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/linux/generic/patches-2.6.39')
| -rw-r--r-- | target/linux/generic/patches-2.6.39/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch | 4 |
1 files changed, 2 insertions, 2 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; |