diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2022-02-09 12:20:45 -0600 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2022-03-10 16:51:50 -0600 |
| commit | 03248addadf1a5ef0a03cbcd5ec905b49adb9658 (patch) | |
| tree | ed830a987bf8cccf7e07883ea1f68259023b1d57 /kernel/entry | |
| parent | d3c51a0c8944e3a5bba458358b4c1f9ae2de0133 (diff) | |
resume_user_mode: Move to resume_user_mode.h
Move set_notify_resume and tracehook_notify_resume into resume_user_mode.h.
While doing that rename tracehook_notify_resume to resume_user_mode_work.
Update all of the places that included tracehook.h for these functions to
include resume_user_mode.h instead.
Update all of the callers of tracehook_notify_resume to call
resume_user_mode_work.
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lkml.kernel.org/r/20220309162454.123006-12-ebiederm@xmission.com
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'kernel/entry')
| -rw-r--r-- | kernel/entry/common.c | 4 | ||||
| -rw-r--r-- | kernel/entry/kvm.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/entry/common.c b/kernel/entry/common.c index 79eaf9b4b10d..a86823cad853 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -2,7 +2,7 @@ #include <linux/context_tracking.h> #include <linux/entry-common.h> -#include <linux/tracehook.h> +#include <linux/resume_user_mode.h> #include <linux/highmem.h> #include <linux/livepatch.h> #include <linux/audit.h> @@ -165,7 +165,7 @@ static unsigned long exit_to_user_mode_loop(struct pt_regs *regs, arch_do_signal_or_restart(regs); if (ti_work & _TIF_NOTIFY_RESUME) - tracehook_notify_resume(regs); + resume_user_mode_work(regs); /* Architecture specific TIF work */ arch_exit_to_user_mode_work(regs, ti_work); diff --git a/kernel/entry/kvm.c b/kernel/entry/kvm.c index 3ab5f98988c3..9d09f489b60e 100644 --- a/kernel/entry/kvm.c +++ b/kernel/entry/kvm.c @@ -23,7 +23,7 @@ static int xfer_to_guest_mode_work(struct kvm_vcpu *vcpu, unsigned long ti_work) schedule(); if (ti_work & _TIF_NOTIFY_RESUME) - tracehook_notify_resume(NULL); + resume_user_mode_work(NULL); ret = arch_xfer_to_guest_mode_handle_work(vcpu, ti_work); if (ret) |