x86: Rename trap_no to trap_nr in thread_struct

[linux-2.6-block.git] / arch / x86 / kernel / traps.c

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 037fc2bc531663fbd2e8147a8d97d8aebc181d1d..c6d17ad59b8aa1b16e3aedd1d87273e160395d94 100644 (file)
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -132,7 +132,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
 trap_signal:
 #endif
        /*
-        * We want error_code and trap_no set for userspace faults and
+        * We want error_code and trap_nr set for userspace faults and
         * kernelspace faults which result in die(), but not
         * kernelspace faults which are fixed up.  die() gives the
         * process no chance to handle the signal and notice the
@@ -141,7 +141,7 @@ trap_signal:
         * delivered, faults.  See also do_general_protection below.
         */
        tsk->thread.error_code = error_code;
-       tsk->thread.trap_no = trapnr;
+       tsk->thread.trap_nr = trapnr;
 
 #ifdef CONFIG_X86_64
        if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
@@ -164,7 +164,7 @@ trap_signal:
 kernel_trap:
        if (!fixup_exception(regs)) {
                tsk->thread.error_code = error_code;
-               tsk->thread.trap_no = trapnr;
+               tsk->thread.trap_nr = trapnr;
                die(str, regs, error_code);
        }
        return;
@@ -240,7 +240,7 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
        notify_die(DIE_TRAP, str, regs, error_code, X86_TRAP_DF, SIGSEGV);
 
        tsk->thread.error_code = error_code;
-       tsk->thread.trap_no = X86_TRAP_DF;
+       tsk->thread.trap_nr = X86_TRAP_DF;
 
        /*
         * This is always a kernel trap and never fixable (and thus must
@@ -268,7 +268,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
                goto gp_in_kernel;
 
        tsk->thread.error_code = error_code;
-       tsk->thread.trap_no = X86_TRAP_GP;
+       tsk->thread.trap_nr = X86_TRAP_GP;
 
        if (show_unhandled_signals && unhandled_signal(tsk, SIGSEGV) &&
                        printk_ratelimit()) {
@@ -295,7 +295,7 @@ gp_in_kernel:
                return;
 
        tsk->thread.error_code = error_code;
-       tsk->thread.trap_no = X86_TRAP_GP;
+       tsk->thread.trap_nr = X86_TRAP_GP;
        if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
                        X86_TRAP_GP, SIGSEGV) == NOTIFY_STOP)
                return;
@@ -475,7 +475,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
        {
                if (!fixup_exception(regs)) {
                        task->thread.error_code = error_code;
-                       task->thread.trap_no = trapnr;
+                       task->thread.trap_nr = trapnr;
                        die(str, regs, error_code);
                }
                return;
@@ -485,7 +485,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
         * Save the info for the exception handler and clear the error.
         */
        save_init_fpu(task);
-       task->thread.trap_no = trapnr;
+       task->thread.trap_nr = trapnr;
        task->thread.error_code = error_code;
        info.si_signo = SIGFPE;
        info.si_errno = 0;