Module Name: src Committed By: dholland Date: Sun Jan 27 04:49:12 UTC 2019
Modified Files: src/sys/arch/aarch64/aarch64: trap.c Log Message: fix duplicated chunk from merge To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/aarch64/aarch64/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/aarch64/aarch64/trap.c diff -u src/sys/arch/aarch64/aarch64/trap.c:1.15 src/sys/arch/aarch64/aarch64/trap.c:1.16 --- src/sys/arch/aarch64/aarch64/trap.c:1.15 Sun Jan 27 02:08:36 2019 +++ src/sys/arch/aarch64/aarch64/trap.c Sun Jan 27 04:49:12 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.15 2019/01/27 02:08:36 pgoyette Exp $ */ +/* $NetBSD: trap.c,v 1.16 2019/01/27 04:49:12 dholland Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -31,10 +31,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.15 2019/01/27 02:08:36 pgoyette Exp $"); - -#include "opt_arm_intr_impl.h" -#include "opt_compat_netbsd32.h" +__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.16 2019/01/27 04:49:12 dholland Exp $"); #include "opt_arm_intr_impl.h" #include "opt_compat_netbsd32.h"