diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-01-29 09:40:23 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-01-29 09:40:23 +0000 |
| commit | 1b3c6ad1fb1fc51b61bfb47ae170ac705468e2f9 (patch) | |
| tree | d63c36f7ae9c15954f64ad254bc8c43a3bd8383f /target/linux/generic/patches-3.7/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch | |
| parent | 6ea9abadebcddb605384dfc2e12687f29fc52f68 (diff) | |
| download | upstream-1b3c6ad1fb1fc51b61bfb47ae170ac705468e2f9.tar.gz upstream-1b3c6ad1fb1fc51b61bfb47ae170ac705468e2f9.tar.bz2 upstream-1b3c6ad1fb1fc51b61bfb47ae170ac705468e2f9.zip | |
generic: fix build failure in MIPS kexec code if SMP is enabled
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35364
Diffstat (limited to 'target/linux/generic/patches-3.7/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch')
| -rw-r--r-- | target/linux/generic/patches-3.7/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.7/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch b/target/linux/generic/patches-3.7/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch index f7a8eed000..e0a1103eb6 100644 --- a/target/linux/generic/patches-3.7/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch +++ b/target/linux/generic/patches-3.7/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); |