x86: x86 ptrace merge removals