Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f540910 authored by Roland McGrath's avatar Roland McGrath Committed by Ingo Molnar
Browse files

x86: handle_vm86_trap cleanup 



Use force_sig in handle_vm86_trap like other machine traps do.

Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b00de174

arch/x86/kernel/vm86_32.c

+1 −8
Original line number Diff line number Diff line
@@ -557,16 +557,9 @@ int handle_vm86_trap(struct kernel_vm86_regs *regs, long error_code, int trapno) 
	}

	if (trapno != 1)

		return 1; /* we let this handle by the calling routine */

	if (current->ptrace & PT_PTRACED) {

		unsigned long flags;

		spin_lock_irqsave(&current->sighand->siglock, flags);

		sigdelset(&current->blocked, SIGTRAP);

		recalc_sigpending();

		spin_unlock_irqrestore(&current->sighand->siglock, flags);

	}

	send_sig(SIGTRAP, current, 1);

	current->thread.trap_no = trapno;

	current->thread.error_code = error_code;

	force_sig(SIGTRAP, current);

	return 0;

}