aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/333-mips-kexec-get-kernel-parameters-from-kexec-tools.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
commit13a89e3e82495328514e717c0f6bada2f9f0fcc5 (patch)
treea5390b835508afdfeaff8d79e3c7fda8308497dd /target/linux/generic/patches-3.6/333-mips-kexec-get-kernel-parameters-from-kexec-tools.patch
parent680983b95c46f346cdc7dfbb12bc28eb4a43d93d (diff)
downloadupstream-13a89e3e82495328514e717c0f6bada2f9f0fcc5.tar.gz
upstream-13a89e3e82495328514e717c0f6bada2f9f0fcc5.tar.bz2
upstream-13a89e3e82495328514e717c0f6bada2f9f0fcc5.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35366 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/333-mips-kexec-get-kernel-parameters-from-kexec-tools.patch')
-rw-r--r--target/linux/generic/patches-3.6/333-mips-kexec-get-kernel-parameters-from-kexec-tools.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.6/333-mips-kexec-get-kernel-parameters-from-kexec-tools.patch b/target/linux/generic/patches-3.6/333-mips-kexec-get-kernel-parameters-from-kexec-tools.patch
index 9da936314c..44380dae6f 100644
--- a/target/linux/generic/patches-3.6/333-mips-kexec-get-kernel-parameters-from-kexec-tools.patch
+++ b/target/linux/generic/patches-3.6/333-mips-kexec-get-kernel-parameters-from-kexec-tools.patch
@@ -19,9 +19,9 @@ Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
#include <asm/page.h>
+#include <asm/uaccess.h>
- int (*_machine_kexec_prepare)(struct kimage *) = NULL;
- void (*_machine_kexec_shutdown)(void) = NULL;
-@@ -35,6 +36,56 @@ static void machine_kexec_init_args(void
+ extern const unsigned char relocate_new_kernel[];
+
+@@ -37,6 +38,56 @@ static void machine_kexec_init_args(void
pr_info("kexec_args[3] (desc): %p\n", (void *)kexec_args[3]);
}
@@ -78,7 +78,7 @@ Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
int
machine_kexec_prepare(struct kimage *kimage)
{
-@@ -45,6 +96,7 @@ machine_kexec_prepare(struct kimage *kim
+@@ -47,6 +98,7 @@ machine_kexec_prepare(struct kimage *kim
* This can be overrided by _machine_kexec_prepare().
*/
machine_kexec_init_args();