---

yaml --- r: 17922 b: refs/heads/master c: 5c617cf h: refs/heads/master v: v3
git-mirror · Jan 12, 2006 · 8aea33f · 8aea33f
1 parent 771d545
commit 8aea33f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a5215882166dd33a95b313637dd318e4c143113
+refs/heads/master: 5c617cfa6422bfba9e79d8d004303a6cc3d2e7d7
diff --git a/trunk/arch/x86_64/kernel/traps.c b/trunk/arch/x86_64/kernel/traps.c
@@ -399,11 +399,6 @@ void die(const char * str, struct pt_regs * regs, long err)
 	oops_end(flags);
 	do_exit(SIGSEGV); 
 }
-static inline void die_if_kernel(const char * str, struct pt_regs * regs, long err)
-{
-	if (!(regs->eflags & VM_MASK) && (regs->cs == __KERNEL_CS))
-		die(str, regs, err);
-}
 
 void die_nmi(char *str, struct pt_regs *regs)
 {