diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-02-09 14:06:44 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-02-09 14:06:44 +0000 |
| commit | d038b562d65cc5eb91c9a2c8324613eabbcd09e9 (patch) | |
| tree | 4bc7961b907440b88707117549b252873d5c2385 /target/linux/generic | |
| parent | 5cab81fff853cb350875821cb1d13c026132edc7 (diff) | |
generic: fix kexec build error for MIPS with gcc-4.6-linaro
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30395 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
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 abc89712b..f31e767a3 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 abc89712b..f31e767a3 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 abc89712b..f31e767a3 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 abc89712b..f31e767a3 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 abc89712b..f31e767a3 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; |