Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-9]: src/sys/arch/amd64/amd64 Fix merge botch in previous.
details: https://anonhg.NetBSD.org/src/rev/03719e800501
branches: netbsd-9
changeset: 963702:03719e800501
user: martin <martin%NetBSD.org@localhost>
date: Mon Mar 09 13:12:14 2020 +0000
description:
Fix merge botch in previous.
diffstat:
sys/arch/amd64/amd64/trap.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diffs (26 lines):
diff -r f7eccbb6b42f -r 03719e800501 sys/arch/amd64/amd64/trap.c
--- a/sys/arch/amd64/amd64/trap.c Mon Mar 09 11:52:14 2020 +0000
+++ b/sys/arch/amd64/amd64/trap.c Mon Mar 09 13:12:14 2020 +0000
@@ -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 @@
MODULE_HOOK_CALL(amd64_oosyscall_hook, (p, frame),
ENOSYS, hook_ret);
if (hook_ret == 0)
+ goto out;
}
/* FALLTHROUGH */
case T_TSSFLT|T_USER:
Home |
Main Index |
Thread Index |
Old Index