Module Name: src
Committed By: martin
Date: Mon Mar 9 13:12:14 UTC 2020
Modified Files:
src/sys/arch/amd64/amd64 [netbsd-9]: trap.c
Log Message:
Fix merge botch in previous.
To generate a diff of this commit:
cvs rdiff -u -r1.121.2.1 -r1.121.2.2 src/sys/arch/amd64/amd64/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/trap.c
diff -u src/sys/arch/amd64/amd64/trap.c:1.121.2.1 src/sys/arch/amd64/amd64/trap.c:1.121.2.2
--- src/sys/arch/amd64/amd64/trap.c:1.121.2.1 Sun Mar 8 10:54:43 2020
+++ src/sys/arch/amd64/amd64/trap.c Mon Mar 9 13:12:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.121.2.1 2020/03/08 10:54:43 martin Exp $ */
+/* $NetBSD: trap.c,v 1.121.2.2 2020/03/09 13:12:14 martin Exp $ */
/*
* Copyright (c) 1998, 2000, 2017 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.121.2.1 2020/03/08 10:54:43 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.121.2.2 2020/03/09 13:12:14 martin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -357,6 +357,7 @@ trap(struct trapframe *frame)
MODULE_HOOK_CALL(amd64_oosyscall_hook, (p, frame),
ENOSYS, hook_ret);
if (hook_ret == 0)
+ goto out;
}
/* FALLTHROUGH */
case T_TSSFLT|T_USER:
