aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86/patches-3.10/160-kexec-fix.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-09-02 07:36:40 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-09-02 07:36:40 +0000
commit11b1887c531015a6e928ed748f72a684c382910c (patch)
treea344b55b6bfc0d5c3ac8e57df5da284d3efd69d2 /target/linux/x86/patches-3.10/160-kexec-fix.patch
parent0a85c59040d6e053199962fe9127cc0d2d8febc3 (diff)
downloadupstream-11b1887c531015a6e928ed748f72a684c382910c.tar.gz
upstream-11b1887c531015a6e928ed748f72a684c382910c.tar.bz2
upstream-11b1887c531015a6e928ed748f72a684c382910c.zip
x86: add support for 3.10
Add kernel configuration and patches for Linux 3.10. Taken from the 'alix2: update to LINUX_VERSION 3.10.9' patch: http://patchwork.openwrt.org/patch/3971/. Russell says in the original patch: "Initial whack at updating alix2 to a current kernel. It builds and runs without problems so far. I copied target/linux/config-3.8, target/linux/x86/alix2/config-3.8, and target/linux/patches-3.8 to their 3.10 equivalents and tweaked until it built. The patches required no changes." The current patch contains additional configuration tweaks, and the kernel patches were refreshed. Signed-off-by: Russell Senior <russell@personaltelco.net> Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 37867
Diffstat (limited to 'target/linux/x86/patches-3.10/160-kexec-fix.patch')
-rw-r--r--target/linux/x86/patches-3.10/160-kexec-fix.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/target/linux/x86/patches-3.10/160-kexec-fix.patch b/target/linux/x86/patches-3.10/160-kexec-fix.patch
new file mode 100644
index 0000000000..ea32494a09
--- /dev/null
+++ b/target/linux/x86/patches-3.10/160-kexec-fix.patch
@@ -0,0 +1,43 @@
+From 357954613bdbab0c1f3986589ff30cc4855a2efd Mon Sep 17 00:00:00 2001
+From: root <root@cent.localnet>
+Date: Sun, 6 Dec 2009 18:26:43 +0000
+Subject: [PATCH 03/14] kexec fix
+
+---
+ arch/x86/kernel/relocate_kernel_32.S | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+--- a/arch/x86/kernel/relocate_kernel_32.S
++++ b/arch/x86/kernel/relocate_kernel_32.S
+@@ -54,8 +54,10 @@ relocate_kernel:
+ movl %eax, CR0(%edi)
+ movl %cr3, %eax
+ movl %eax, CR3(%edi)
++#ifndef CONFIG_X86_RDC321X
+ movl %cr4, %eax
+ movl %eax, CR4(%edi)
++#endif
+
+ /* read the arguments and say goodbye to the stack */
+ movl 20+4(%esp), %ebx /* page_list */
+@@ -124,7 +126,9 @@ identity_mapped:
+ * Setting everything to zero seems safe.
+ */
+ xorl %eax, %eax
++#ifndef CONFIG_X86_RDC321X
+ movl %eax, %cr4
++#endif
+
+ jmp 1f
+ 1:
+@@ -195,8 +199,10 @@ identity_mapped:
+ ret
+
+ virtual_mapped:
++#ifndef CONFIG_X86_RDC321X
+ movl CR4(%edi), %eax
+ movl %eax, %cr4
++#endif
+ movl CR3(%edi), %eax
+ movl %eax, %cr3
+ movl CR0(%edi), %eax