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

Commit 51e7dc70 authored by Srikar Dronamraju's avatar Srikar Dronamraju Committed by Ingo Molnar
Browse files

x86: Rename trap_no to trap_nr in thread_struct 



There are precedences of trap number being referred to as
trap_nr. However thread struct refers trap number as trap_no.
Change it to trap_nr.

Also use enum instead of left-over literals for trap values.

This is pure cleanup, no functional change intended.

Suggested-by: default avatarIngo Molnar <mingo@eltu.hu>
Signed-off-by: default avatarSrikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Jim Keniston <jkenisto@linux.vnet.ibm.com>
Cc: Linux-mm <linux-mm@kvack.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20120312092555.5379.942.sendpatchset@srdronam.in.ibm.com


[ Fixed the math-emu build ]
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e898c670

arch/x86/ia32/ia32_signal.c

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc, 
		put_user_ex(regs->dx, &sc->dx);

		put_user_ex(regs->cx, &sc->cx);

		put_user_ex(regs->ax, &sc->ax);

		put_user_ex(current->thread.trap_no, &sc->trapno);

		put_user_ex(current->thread.trap_nr, &sc->trapno);

		put_user_ex(current->thread.error_code, &sc->err);

		put_user_ex(regs->ip, &sc->ip);

		put_user_ex(regs->cs, (unsigned int __user *)&sc->cs);

arch/x86/include/asm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ struct thread_struct { 
	unsigned long           ptrace_dr7;

	/* Fault info: */

	unsigned long		cr2;

	unsigned long		trap_no;

	unsigned long		trap_nr;

	unsigned long		error_code;

	/* floating point and extended processor state */

	struct fpu		fpu;

arch/x86/kernel/dumpstack.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err) 
#endif

	printk("\n");

	if (notify_die(DIE_OOPS, str, regs, err,

			current->thread.trap_no, SIGSEGV) == NOTIFY_STOP)

			current->thread.trap_nr, SIGSEGV) == NOTIFY_STOP)

		return 1;



	show_registers(regs);

arch/x86/kernel/ptrace.c

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <asm/prctl.h>

#include <asm/proto.h>

#include <asm/hw_breakpoint.h>

#include <asm/traps.h>



#include "tls.h"
@@ -1425,7 +1426,7 @@ static void fill_sigtrap_info(struct task_struct *tsk, 
				int error_code, int si_code,

				struct siginfo *info)

{

	tsk->thread.trap_no = 1;

	tsk->thread.trap_nr = X86_TRAP_DB;

	tsk->thread.error_code = error_code;



	memset(info, 0, sizeof(*info));

arch/x86/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ int setup_sigcontext(struct sigcontext __user *sc, void __user *fpstate, 
		put_user_ex(regs->r15, &sc->r15);

#endif /* CONFIG_X86_64 */



		put_user_ex(current->thread.trap_no, &sc->trapno);

		put_user_ex(current->thread.trap_nr, &sc->trapno);

		put_user_ex(current->thread.error_code, &sc->err);

		put_user_ex(regs->ip, &sc->ip);

#ifdef CONFIG_X86_32