From eb7f72ca0198342101ac31564f29392727037f83 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Thu, 8 Apr 2010 07:53:14 +0000 Subject: [PATCH] [kernel] fix kexec for mips, patch from Adrian Byszuk (#7115) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20745 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.25/023-mips-fix-kexec.patch | 11 +++++++++++ .../patches-2.6.30/023-mips-fix-kexec.patch | 11 +++++++++++ .../patches-2.6.31/023-mips-fix-kexec.patch | 11 +++++++++++ .../patches-2.6.32/023-mips-fix-kexec.patch | 11 +++++++++++ .../patches-2.6.33/023-mips-fix-kexec.patch | 11 +++++++++++ .../patches-2.6.34/023-mips-fix-kexec.patch | 11 +++++++++++ 6 files changed, 66 insertions(+) create mode 100644 target/linux/generic-2.6/patches-2.6.25/023-mips-fix-kexec.patch create mode 100644 target/linux/generic-2.6/patches-2.6.30/023-mips-fix-kexec.patch create mode 100644 target/linux/generic-2.6/patches-2.6.31/023-mips-fix-kexec.patch create mode 100644 target/linux/generic-2.6/patches-2.6.32/023-mips-fix-kexec.patch create mode 100644 target/linux/generic-2.6/patches-2.6.33/023-mips-fix-kexec.patch create mode 100644 target/linux/generic-2.6/patches-2.6.34/023-mips-fix-kexec.patch diff --git a/target/linux/generic-2.6/patches-2.6.25/023-mips-fix-kexec.patch b/target/linux/generic-2.6/patches-2.6.25/023-mips-fix-kexec.patch new file mode 100644 index 0000000000..e51005f308 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.25/023-mips-fix-kexec.patch @@ -0,0 +1,11 @@ +--- a/arch/mips/kernel/machine_kexec.c 2010-03-15 15:52:04.000000000 +0000 ++++ b/arch/mips/kernel/machine_kexec.c 2010-03-29 12:10:37.000000000 +0100 +@@ -52,7 +52,7 @@ + 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); + diff --git a/target/linux/generic-2.6/patches-2.6.30/023-mips-fix-kexec.patch b/target/linux/generic-2.6/patches-2.6.30/023-mips-fix-kexec.patch new file mode 100644 index 0000000000..e51005f308 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.30/023-mips-fix-kexec.patch @@ -0,0 +1,11 @@ +--- a/arch/mips/kernel/machine_kexec.c 2010-03-15 15:52:04.000000000 +0000 ++++ b/arch/mips/kernel/machine_kexec.c 2010-03-29 12:10:37.000000000 +0100 +@@ -52,7 +52,7 @@ + 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); + diff --git a/target/linux/generic-2.6/patches-2.6.31/023-mips-fix-kexec.patch b/target/linux/generic-2.6/patches-2.6.31/023-mips-fix-kexec.patch new file mode 100644 index 0000000000..e51005f308 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.31/023-mips-fix-kexec.patch @@ -0,0 +1,11 @@ +--- a/arch/mips/kernel/machine_kexec.c 2010-03-15 15:52:04.000000000 +0000 ++++ b/arch/mips/kernel/machine_kexec.c 2010-03-29 12:10:37.000000000 +0100 +@@ -52,7 +52,7 @@ + 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); + diff --git a/target/linux/generic-2.6/patches-2.6.32/023-mips-fix-kexec.patch b/target/linux/generic-2.6/patches-2.6.32/023-mips-fix-kexec.patch new file mode 100644 index 0000000000..e51005f308 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.32/023-mips-fix-kexec.patch @@ -0,0 +1,11 @@ +--- a/arch/mips/kernel/machine_kexec.c 2010-03-15 15:52:04.000000000 +0000 ++++ b/arch/mips/kernel/machine_kexec.c 2010-03-29 12:10:37.000000000 +0100 +@@ -52,7 +52,7 @@ + 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); + diff --git a/target/linux/generic-2.6/patches-2.6.33/023-mips-fix-kexec.patch b/target/linux/generic-2.6/patches-2.6.33/023-mips-fix-kexec.patch new file mode 100644 index 0000000000..e51005f308 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.33/023-mips-fix-kexec.patch @@ -0,0 +1,11 @@ +--- a/arch/mips/kernel/machine_kexec.c 2010-03-15 15:52:04.000000000 +0000 ++++ b/arch/mips/kernel/machine_kexec.c 2010-03-29 12:10:37.000000000 +0100 +@@ -52,7 +52,7 @@ + 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); + diff --git a/target/linux/generic-2.6/patches-2.6.34/023-mips-fix-kexec.patch b/target/linux/generic-2.6/patches-2.6.34/023-mips-fix-kexec.patch new file mode 100644 index 0000000000..e51005f308 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.34/023-mips-fix-kexec.patch @@ -0,0 +1,11 @@ +--- a/arch/mips/kernel/machine_kexec.c 2010-03-15 15:52:04.000000000 +0000 ++++ b/arch/mips/kernel/machine_kexec.c 2010-03-29 12:10:37.000000000 +0100 +@@ -52,7 +52,7 @@ + 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); +