diff options
| author |   Zhenyu Wang <zhenyuw@linux.intel.com> | 2020-10-30 11:48:17 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyuw@linux.intel.com> | 2020-10-30 11:48:17 +0800 |
| commit | 4a95857a875e887cc958c92fe9d2cde6184d2ec0 (patch) | |
| tree | 8d67b681d582ba7ee11a359be7af82ed77bd6620 /kernel/entry/common.c | |
| parent | drm/i915/gvt: Only pin/unpin intel_context along with workload (diff) | |
| parent | drm/i915: Reject 90/270 degree rotated initial fbs (diff) | |
| download | wireguard-linux-4a95857a875e887cc958c92fe9d2cde6184d2ec0.tar.xz wireguard-linux-4a95857a875e887cc958c92fe9d2cde6184d2ec0.zip | |
Merge tag 'drm-intel-fixes-2020-10-29' into gvt-fixes
Backmerge for 5.10-rc1 to apply one extra APL fix.
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Diffstat (limited to '')
| -rw-r--r-- | kernel/entry/common.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/entry/common.c b/kernel/entry/common.c index 6fdb6105e6d6..2b8366693d5c 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -161,7 +161,6 @@ static unsigned long exit_to_user_mode_loop(struct pt_regs *regs, arch_do_signal(regs); if (ti_work & _TIF_NOTIFY_RESUME) { - clear_thread_flag(TIF_NOTIFY_RESUME); tracehook_notify_resume(regs); rseq_handle_notify_resume(NULL, regs); } @@ -208,7 +207,7 @@ static inline bool report_single_step(unsigned long ti_work) /* * If TIF_SYSCALL_EMU is set, then the only reason to report is when * TIF_SINGLESTEP is set (i.e. PTRACE_SYSEMU_SINGLESTEP). This syscall - * instruction has been already reported in syscall_enter_from_usermode(). + * instruction has been already reported in syscall_enter_from_user_mode(). */ #define SYSEMU_STEP (_TIF_SINGLESTEP | _TIF_SYSCALL_EMU) @@ -304,7 +303,7 @@ noinstr irqentry_state_t irqentry_enter(struct pt_regs *regs) * terminate a grace period, if and only if the timer interrupt is * not nested into another interrupt. * - * Checking for __rcu_is_watching() here would prevent the nesting + * Checking for rcu_is_watching() here would prevent the nesting * interrupt to invoke rcu_irq_enter(). If that nested interrupt is * the tick then rcu_flavor_sched_clock_irq() would wrongfully * assume that it is the first interupt and eventually claim |