try to fix up 1386 build on 4.4...

diff --git a/queue-4.4/x86-retpoline-entry-convert-entry-assembler-indirect-jumps.patch b/queue-4.4/x86-retpoline-entry-convert-entry-assembler-indirect-jumps.patch
index a5b89082f440fd8d6fb8dc19e2e0f7c335fb6dc8..147e5c74ba06336d3f145905fcb14b55ed046e06 100644 (file)
--- a/queue-4.4/x86-retpoline-entry-convert-entry-assembler-indirect-jumps.patch
+++ b/queue-4.4/x86-retpoline-entry-convert-entry-assembler-indirect-jumps.patch
@@ -42,9 +42,9 @@ Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
 Signed-off-by: Razvan Ghitulete <rga@amazon.de>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- arch/x86/entry/entry_32.S |    5 +++--
+ arch/x86/entry/entry_32.S |    6 ++++--
  arch/x86/entry/entry_64.S |   14 +++++++++++++-
- 2 files changed, 16 insertions(+), 3 deletions(-)
+ 2 files changed, 17 insertions(+), 3 deletions(-)
 
 --- a/arch/x86/entry/entry_32.S
 +++ b/arch/x86/entry/entry_32.S
@@ -56,16 +56,17 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        .section .entry.text, "ax"
  
-@@ -226,7 +227,7 @@ ENTRY(ret_from_kernel_thread)
+@@ -226,7 +227,8 @@ ENTRY(ret_from_kernel_thread)
        pushl   $0x0202                         # Reset kernel eflags
        popfl
        movl    PT_EBP(%esp), %eax
 -      call    *PT_EBX(%esp)
-+      CALL_NOSPEC PT_EBX(%esp)
++      movl    PT_EBX(%esp), %edx
++      CALL_NOSPEC %edx
        movl    $0, PT_EAX(%esp)
  
        /*
-@@ -938,7 +939,7 @@ error_code:
+@@ -938,7 +940,7 @@ error_code:
        movl    %ecx, %es
        TRACE_IRQS_OFF
        movl    %esp, %eax                      # pt_regs pointer

diff --git a/queue-4.4/x86-retpoline-ftrace-convert-ftrace-assembler-indirect-jumps.patch b/queue-4.4/x86-retpoline-ftrace-convert-ftrace-assembler-indirect-jumps.patch
index f35a7293b08835dbe2e0ca4c0a7f7c22f6bf6b8d..dab29469cf969d1f033c93230abc67bd1314b893 100644 (file)
--- a/queue-4.4/x86-retpoline-ftrace-convert-ftrace-assembler-indirect-jumps.patch
+++ b/queue-4.4/x86-retpoline-ftrace-convert-ftrace-assembler-indirect-jumps.patch
@@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/arch/x86/entry/entry_32.S
 +++ b/arch/x86/entry/entry_32.S
-@@ -862,7 +862,8 @@ trace:
+@@ -863,7 +863,8 @@ trace:
        movl    0x4(%ebp), %edx
        subl    $MCOUNT_INSN_SIZE, %eax
  
@@ -49,7 +49,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        popl    %edx
        popl    %ecx
-@@ -897,7 +898,7 @@ return_to_handler:
+@@ -898,7 +899,7 @@ return_to_handler:
        movl    %eax, %ecx
        popl    %edx
        popl    %eax