From 33ad5b0e8faff26aa5a979aa4e9b536c7f14eb19 Mon Sep 17 00:00:00 2001 From: kettenis Date: Sat, 26 Jun 2021 17:38:40 +0000 Subject: [PATCH] For some reason the riscv64 locore.S ended up with the copyright license from the arm64 locore.S. But the code was clearly copied from FreeBSD's riscv64 locore.S. The license is the same, but the author/attribution isn't. Fix this. ok deraadt@ --- sys/arch/riscv64/riscv64/locore.S | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/arch/riscv64/riscv64/locore.S b/sys/arch/riscv64/riscv64/locore.S index c80766b15d0..24d4290b92f 100644 --- a/sys/arch/riscv64/riscv64/locore.S +++ b/sys/arch/riscv64/riscv64/locore.S @@ -1,9 +1,17 @@ -/* $OpenBSD: locore.S,v 1.7 2021/05/21 16:50:48 deraadt Exp $ */ +/* $OpenBSD: locore.S,v 1.8 2021/06/26 17:38:40 kettenis Exp $ */ /*- - * Copyright (c) 2012-2014 Andrew Turner + * Copyright (c) 2015-2018 Ruslan Bukin * All rights reserved. * + * Portions of this software were developed by SRI International and the + * University of Cambridge Computer Laboratory under DARPA/AFRL contract + * FA8750-10-C-0237 ("CTSRD"), as part of the DARPA CRASH research programme. + * + * Portions of this software were developed by the University of Cambridge + * Computer Laboratory as part of the CTSRD Project, with support from the + * UK Higher Education Innovation Fund (HEIF). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,8 +32,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: head/sys/arm64/arm64/locore.S 282867 2015-05-13 18:57:03Z zbb $ */ #include -- 2.20.1