Revert to using test_tsk_thread_flag for uprobes2

_stp_is_compat_task is not required for uprobes2 since uprobes2 is only used
for rhel6 and rhel7.

diff --git a/runtime/linux/uprobes2/uprobes_x86.h b/runtime/linux/uprobes2/uprobes_x86.h
index 21ddc25a74191e5b5dba211d314cf37c6c6850b5..f88a87daa763ac21fa8aecdb6976dac66b88cc87 100644 (file)
--- a/runtime/linux/uprobes2/uprobes_x86.h
+++ b/runtime/linux/uprobes2/uprobes_x86.h
@@ -38,7 +38,7 @@ typedef u8 uprobe_opcode_t;
 #ifdef CONFIG_X86_32
 #define SLOT_IP(tsk) 12
 #else
-#define SLOT_IP(tsk) (_stp_is_compat_task2(tsk) ? 12 : 16)
+#define SLOT_IP(tsk) (test_tsk_thread_flag(tsk, TIF_IA32) ? 12 : 16)
 #endif
 
 #define BREAKPOINT_SIGNAL SIGTRAP
@@ -111,7 +111,7 @@ static inline unsigned long arch_get_cur_sp(struct pt_regs *regs)
 static inline unsigned long arch_predict_sp_at_ret(struct pt_regs *regs,
                struct task_struct *tsk)
 {
-       if (_stp_is_compat_task2(tsk))
+       if (test_tsk_thread_flag(tsk, TIF_IA32))
                return (unsigned long) (regs->sp + 4 + STRUCT_RETURN_SLOP);
        else
                return (unsigned long) (regs->sp + 8);