diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2023-10-05 22:57:34 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@kernel.org> | 2023-10-06 17:08:47 +0300 |
| commit | 7d6904bf26b96ef087514cb7a8c50b62a4911c99 (patch) | |
| tree | 2feaff8495d88c2102dc2e017b7afc5c58db02d6 /kernel/entry/common.c | |
| parent | 9418edf8ff01e7a4904aac1aca4864ecdea37593 (diff) | |
| parent | 22061bfc57fe08c77141dc876b4af75603c4d61d (diff) | |
Merge wireless into wireless-next
Resolve several conflicts, mostly between changes/fixes in
wireless and the locking rework in wireless-next. One of
the conflicts actually shows a bug in wireless that we'll
want to fix separately.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Diffstat (limited to 'kernel/entry/common.c')
| -rw-r--r-- | kernel/entry/common.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/entry/common.c b/kernel/entry/common.c index be61332c66b5..d7ee4bc3f2ba 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -205,8 +205,7 @@ static void exit_to_user_mode_prepare(struct pt_regs *regs) arch_exit_to_user_mode_prepare(regs, ti_work); - /* Ensure that the address limit is intact and no locks are held */ - addr_limit_user_check(); + /* Ensure that kernel state is sane for a return to userspace */ kmap_assert_nomap(); lockdep_assert_irqs_disabled(); lockdep_sys_exit(); |