Commit d4fa09e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'exit-cleanups-for-v5.16' of... 

Merge branch 'exit-cleanups-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull vm86 fix from Eric Biederman:
 "Just the removal of an unnecessary (and incorrect) test from a BUG_ON"

* 'exit-cleanups-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  signal/vm86_32: Remove pointless test in BUG_ON
parents be427a88 c7a9b647

arch/x86/kernel/vm86_32.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ void save_v86_state(struct kernel_vm86_regs *regs, int retval) 
	 */

	local_irq_enable();



	BUG_ON(!vm86 || !vm86->user_vm86);

	BUG_ON(!vm86);



	set_flags(regs->pt.flags, VEFLAGS, X86_EFLAGS_VIF | vm86->veflags_mask);

	user = vm86->user_vm86;