oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel: restore setting KTS_NONE

Browse Source 
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.
This commit is contained in:
Ben Gras 2013-01-04 14:58:12 +00:00
parent 75c515e5f8
commit 7f1018b145
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/arch/i386/arch_system.c
View File

@ -564,8 +564,6 @@ void restore_user_context(struct proc *p)
#define TYPES 10 #define TYPES 10
static int restores[TYPES], n = 0; static int restores[TYPES], n = 0;
p->p_seg.p_kern_trap_style = KTS_NONE;
if(trap_style >= 0 && trap_style < TYPES) if(trap_style >= 0 && trap_style < TYPES)
restores[trap_style]++; restores[trap_style]++;
@ -578,6 +576,8 @@ void restore_user_context(struct proc *p)
} }
#endif #endif
p->p_seg.p_kern_trap_style = KTS_NONE;
if(trap_style == KTS_SYSENTER) { if(trap_style == KTS_SYSENTER) {
restore_user_context_sysenter(p); restore_user_context_sysenter(p);
NOT_REACHABLE; NOT_REACHABLE;