Merge branch 'linus' into locking/core, to fix up conflicts

 Conflicts:
	mm/page_alloc.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2 files changed, 29 insertions, 1 deletions

diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c
index a36c2eba64e7..4559a21a8de2 100644
--- a/tools/objtool/arch/x86/decode.c
+++ b/tools/objtool/arch/x86/decode.c
@@ -271,7 +271,7 @@ int arch_decode_instruction(struct elf *elf, struct section *sec,
         case 0x8d:
                 if (rex == 0x48 && modrm == 0x65) {
 
-                        /* lea -disp(%rbp), %rsp */
+                        /* lea disp(%rbp), %rsp */
                         *type = INSN_STACK;
                         op->src.type = OP_SRC_ADD;
                         op->src.reg = CFI_BP;
@@ -281,6 +281,30 @@ int arch_decode_instruction(struct elf *elf, struct section *sec,
                         break;
                 }
 
+                if (rex == 0x48 && (modrm == 0xa4 || modrm == 0x64) &&
+                    sib == 0x24) {
+
+                        /* lea disp(%rsp), %rsp */
+                        *type = INSN_STACK;
+                        op->src.type = OP_SRC_ADD;
+                        op->src.reg = CFI_SP;
+                        op->src.offset = insn.displacement.value;
+                        op->dest.type = OP_DEST_REG;
+                        op->dest.reg = CFI_SP;
+                        break;
+                }
+
+                if (rex == 0x48 && modrm == 0x2c && sib == 0x24) {
+
+                        /* lea (%rsp), %rbp */
+                        *type = INSN_STACK;
+                        op->src.type = OP_SRC_REG;
+                        op->src.reg = CFI_SP;
+                        op->dest.type = OP_DEST_REG;
+                        op->dest.reg = CFI_BP;
+                        break;
+                }
+
                 if (rex == 0x4c && modrm == 0x54 && sib == 0x24 &&
                     insn.displacement.value == 8) {
 
diff --git a/tools/testing/selftests/ntb/ntb_test.sh b/tools/testing/selftests/ntb/ntb_test.sh
index 1c12b5855e4f..5fc7ad359e21 100755
--- a/tools/testing/selftests/ntb/ntb_test.sh
+++ b/tools/testing/selftests/ntb/ntb_test.sh
@@ -333,6 +333,10 @@ function ntb_tool_tests()
         link_test $LOCAL_TOOL $REMOTE_TOOL
         link_test $REMOTE_TOOL $LOCAL_TOOL
 
+        #Ensure the link is up on both sides before continuing
+        write_file Y $LOCAL_TOOL/link_event
+        write_file Y $REMOTE_TOOL/link_event
+
         for PEER_TRANS in $(ls $LOCAL_TOOL/peer_trans*); do
                 PT=$(basename $PEER_TRANS)
                 write_file $MW_SIZE $LOCAL_TOOL/$PT