aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-01-29 09:44:58 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-01-29 09:44:58 +0000
commite252a1492ca6f9830c98106d3c3ae7917446fadc (patch)
tree30fde0ee404e51739d454dca28a75467656ed047 /target/linux/generic/patches-3.6/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
parent22ce389e6a576c017ba2a298d2a89aa5fc6f99ad (diff)
downloadupstream-e252a1492ca6f9830c98106d3c3ae7917446fadc.tar.gz
upstream-e252a1492ca6f9830c98106d3c3ae7917446fadc.tar.bz2
upstream-e252a1492ca6f9830c98106d3c3ae7917446fadc.zip
generic: fix build failure in MIPS kexec code if SMP is enabled
Fix it for older kernels as well. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 35366
Diffstat (limited to 'target/linux/generic/patches-3.6/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch')
-rw-r--r--target/linux/generic/patches-3.6/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.6/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch b/target/linux/generic/patches-3.6/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
index f7a8eed000..e0a1103eb6 100644
--- a/target/linux/generic/patches-3.6/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
+++ b/target/linux/generic/patches-3.6/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/kernel/machine_kexec.c
+++ b/arch/mips/kernel/machine_kexec.c
-@@ -23,67 +23,104 @@ void (*relocated_kexec_smp_wait) (void *
+@@ -25,67 +25,104 @@ void (*relocated_kexec_smp_wait) (void *
atomic_t kexec_ready_to_reboot = ATOMIC_INIT(0);
#endif
@@ -151,7 +151,7 @@
}
int
-@@ -95,8 +132,14 @@ machine_kexec_prepare(struct kimage *kim
+@@ -97,8 +134,14 @@ machine_kexec_prepare(struct kimage *kim
*
* This can be overrided by _machine_kexec_prepare().
*/
@@ -168,7 +168,7 @@
if (_machine_kexec_prepare)
return _machine_kexec_prepare(kimage);
-@@ -152,11 +195,13 @@ machine_kexec(struct kimage *image)
+@@ -154,11 +197,13 @@ machine_kexec(struct kimage *image)
pr_info("kexec_indirection_page = %p\n",
(void *)kexec_indirection_page);