From 7f1018b145ebb8c756082f3aca6f116612bc2479 Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Fri, 4 Jan 2013 14:58:12 +0000 Subject: [PATCH] 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. --- kernel/arch/i386/arch_system.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; -- 2.11.4.GIT