summaryrefslogtreecommitdiff
path: root/target/linux/generic-2.6/patches-2.6.30/029-mips_kexec.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-09 19:26:57 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-09 19:26:57 +0000
commit37ed3994c526adda5f527532e0ff753c4bfecc28 (patch)
tree0966ff42f6c8406486ba415fe96a956359b14453 /target/linux/generic-2.6/patches-2.6.30/029-mips_kexec.patch
parent7612d838205bf9a71ab0bd1218e90a758cc083db (diff)
[kernel] refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20767 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30/029-mips_kexec.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/029-mips_kexec.patch15
1 files changed, 2 insertions, 13 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/029-mips_kexec.patch b/target/linux/generic-2.6/patches-2.6.30/029-mips_kexec.patch
index 49b80e7d4f..0eebacfa3f 100644
--- a/target/linux/generic-2.6/patches-2.6.30/029-mips_kexec.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/029-mips_kexec.patch
@@ -349,18 +349,7 @@ create mode 100644 arch/mips/kernel/crash_dump.c
typedef void (*noretfun_t)(void) __attribute__((noreturn));
void
-@@ -52,7 +73,9 @@ machine_kexec(struct kimage *image)
- reboot_code_buffer =
- (unsigned long)page_address(image->control_code_page);
-
-- kexec_start_address = image->start;
-+ kexec_start_address =
-+ (unsigned long) phys_to_virt(image->start);
-+
- kexec_indirection_page =
- (unsigned long) phys_to_virt(image->head & PAGE_MASK);
-
-@@ -63,7 +86,7 @@ machine_kexec(struct kimage *image)
+@@ -63,7 +84,7 @@ machine_kexec(struct kimage *image)
* The generic kexec code builds a page list with physical
* addresses. they are directly accessible through KSEG0 (or
* CKSEG0 or XPHYS if on 64bit system), hence the
@@ -369,7 +358,7 @@ create mode 100644 arch/mips/kernel/crash_dump.c
*/
for (ptr = &image->head; (entry = *ptr) && !(entry &IND_DONE);
ptr = (entry & IND_INDIRECTION) ?
-@@ -78,8 +101,39 @@ machine_kexec(struct kimage *image)
+@@ -78,8 +99,39 @@ machine_kexec(struct kimage *image)
*/
local_irq_disable();