diff --git a/[refs] b/[refs] index 42d120425b00..6a4c5efe3089 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 608e7427c0a06de0d70374a9fd7defc8eb228b7e +refs/heads/master: af4355e91f15812df8608925738c91be57c580dd diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c index 071edcb3e62d..f6c7062fb950 100644 --- a/trunk/kernel/events/uprobes.c +++ b/trunk/kernel/events/uprobes.c @@ -1223,8 +1223,7 @@ static void xol_free_insn_slot(struct task_struct *tsk) return; slot_addr = tsk->utask->xol_vaddr; - - if (unlikely(!slot_addr || IS_ERR_VALUE(slot_addr))) + if (unlikely(!slot_addr)) return; area = tsk->mm->uprobes_state.xol_area;