Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 and PTI fixes from Ingo Molnar:
 "Misc fixes:

   - fix EFI pagetables freeing

   - fix vsyscall pagetable setting on Xen PV guests

   - remove ancient CONFIG_X86_PPRO_FENCE=y - x86 is TSO again

   - fix two binutils (ld) development version related incompatibilities

   - clean up breakpoint handling

   - fix an x86 self-test"

* 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/entry/64: Don't use IST entry for #BP stack
  x86/efi: Free efi_pgd with free_pages()
  x86/vsyscall/64: Use proper accessor to update P4D entry
  x86/cpu: Remove the CONFIG_X86_PPRO_FENCE=y quirk
  x86/boot/64: Verify alignment of the LOAD segment
  x86/build/64: Force the linker to use 2MB page size
  selftests/x86/ptrace_syscall: Fix for yet more glibc interference

1 files changed, 6 insertions, 2 deletions

diff --git a/tools/testing/selftests/x86/ptrace_syscall.c b/tools/testing/selftests/x86/ptrace_syscall.c
index 1ae1c5a7392e..6f22238f3217 100644
--- a/tools/testing/selftests/x86/ptrace_syscall.c
+++ b/tools/testing/selftests/x86/ptrace_syscall.c
@@ -183,8 +183,10 @@ static void test_ptrace_syscall_restart(void)
                 if (ptrace(PTRACE_TRACEME, 0, 0, 0) != 0)
                         err(1, "PTRACE_TRACEME");
 
+                pid_t pid = getpid(), tid = syscall(SYS_gettid);
+
                 printf("\tChild will make one syscall\n");
-                raise(SIGSTOP);
+                syscall(SYS_tgkill, pid, tid, SIGSTOP);
 
                 syscall(SYS_gettid, 10, 11, 12, 13, 14, 15);
                 _exit(0);
@@ -301,9 +303,11 @@ static void test_restart_under_ptrace(void)
                 if (ptrace(PTRACE_TRACEME, 0, 0, 0) != 0)
                         err(1, "PTRACE_TRACEME");
 
+                pid_t pid = getpid(), tid = syscall(SYS_gettid);
+
                 printf("\tChild will take a nap until signaled\n");
                 setsigign(SIGUSR1, SA_RESTART);
-                raise(SIGSTOP);
+                syscall(SYS_tgkill, pid, tid, SIGSTOP);
 
                 syscall(SYS_pause, 0, 0, 0, 0, 0, 0);
                 _exit(0);