From: Ben Gras <ben@minix3.org>
Date: Fri, 4 Jan 2013 14:58:12 +0000 (+0000)
Subject: kernel: restore setting KTS_NONE
X-Git-Tag: v3.2.1~138
X-Git-Url: http://zhaoyanbai.com/repos/cppcheck.log?a=commitdiff_plain;h=7f1018b145ebb8c756082f3aca6f116612bc2479;p=minix.git

kernel: restore setting KTS_NONE

The 'trap style' variable records how a process has trapped into the
kernel (hardware/software interrupt, or one of the other trap
instructions). KTS_NONE indicates the process isn't trapped into the
kernel at all and is useful for sanity checking. The KTS_NONE reset was
inadvertently removed while removing some debugging code and this commit
restores it.
---

diff --git a/kernel/arch/i386/arch_system.c b/kernel/arch/i386/arch_system.c
index 4b1812be8..376586cd6 100644
--- a/kernel/arch/i386/arch_system.c
+++ b/kernel/arch/i386/arch_system.c
@@ -564,8 +564,6 @@ void restore_user_context(struct proc *p)
 #define TYPES 10
 	static int restores[TYPES], n = 0;
 
-	p->p_seg.p_kern_trap_style = KTS_NONE;
-
 	if(trap_style >= 0 && trap_style < TYPES)
 		restores[trap_style]++;
 
@@ -578,6 +576,8 @@ void restore_user_context(struct proc *p)
 	}
 #endif
 
+	p->p_seg.p_kern_trap_style = KTS_NONE;
+
 	if(trap_style == KTS_SYSENTER) {
 		restore_user_context_sysenter(p);
 		NOT_REACHABLE;