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

Commit bd8b96df authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: clean up comment style in arch/x86/kernel/traps.c



Impact: cleanup

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c656d9ca
Loading
Loading
Loading
Loading
+17 −9
Original line number Original line Diff line number Diff line
@@ -292,8 +292,10 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
	tsk->thread.error_code = error_code;
	tsk->thread.error_code = error_code;
	tsk->thread.trap_no = 8;
	tsk->thread.trap_no = 8;


	/* This is always a kernel trap and never fixable (and thus must
	/*
	   never return). */
	 * This is always a kernel trap and never fixable (and thus must
	 * never return).
	 */
	for (;;)
	for (;;)
		die(str, regs, error_code);
		die(str, regs, error_code);
}
}
@@ -524,9 +526,11 @@ dotraplinkage void __kprobes do_int3(struct pt_regs *regs, long error_code)
}
}


#ifdef CONFIG_X86_64
#ifdef CONFIG_X86_64
/* Help handler running on IST stack to switch back to user stack
/*
   for scheduling or signal handling. The actual stack switch is done in
 * Help handler running on IST stack to switch back to user stack
   entry.S */
 * for scheduling or signal handling. The actual stack switch is done in
 * entry.S
 */
asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *eregs)
asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *eregs)
{
{
	struct pt_regs *regs = eregs;
	struct pt_regs *regs = eregs;
@@ -536,8 +540,10 @@ asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *eregs)
	/* Exception from user space */
	/* Exception from user space */
	else if (user_mode(eregs))
	else if (user_mode(eregs))
		regs = task_pt_regs(current);
		regs = task_pt_regs(current);
	/* Exception from kernel and interrupts are enabled. Move to
	/*
	   kernel process stack. */
	 * Exception from kernel and interrupts are enabled. Move to
	 * kernel process stack.
	 */
	else if (eregs->flags & X86_EFLAGS_IF)
	else if (eregs->flags & X86_EFLAGS_IF)
		regs = (struct pt_regs *)(eregs->sp -= sizeof(struct pt_regs));
		regs = (struct pt_regs *)(eregs->sp -= sizeof(struct pt_regs));
	if (eregs != regs)
	if (eregs != regs)
@@ -707,8 +713,10 @@ void math_error(void __user *ip)
	} else if (err & 0x020) { /* Precision */
	} else if (err & 0x020) { /* Precision */
		info.si_code = FPE_FLTRES;
		info.si_code = FPE_FLTRES;
	} else {
	} else {
		/* If we're using IRQ 13, or supposedly even some trap 16
		/*
		   implementations, it's possible we get a spurious trap... */
		 * If we're using IRQ 13, or supposedly even some trap 16
		 * implementations, it's possible we get a spurious trap...
		 */
		return;		/* Spurious trap, no error */
		return;		/* Spurious trap, no error */
	}
	}
	force_sig_info(SIGFPE, &info, task);
	force_sig_info(SIGFPE, &info, task);