From 3a74375858ab5e3dc5fdb314c4eed685a3762b57 Mon Sep 17 00:00:00 2001 From: Michael Shalayeff Date: Mon, 9 Dec 2002 18:36:34 +0000 Subject: update utah-u copyright from the newer pmk snap; 10x to mike hibler for rolling one just for this --- sys/arch/hppa/hppa/locore.S | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) (limited to 'sys/arch') diff --git a/sys/arch/hppa/hppa/locore.S b/sys/arch/hppa/hppa/locore.S index 3c4f702c62e..c51e92eefa0 100644 --- a/sys/arch/hppa/hppa/locore.S +++ b/sys/arch/hppa/hppa/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.97 2002/11/27 21:47:14 mickey Exp $ */ +/* $OpenBSD: locore.S,v 1.98 2002/12/09 18:36:33 mickey Exp $ */ /* * Copyright (c) 1998-2002 Michael Shalayeff @@ -33,19 +33,6 @@ * Portitions of this file are derived from other sources, see * the copyrights and acknowledgements below. */ -/* - * Copyright (c) 1990,1991,1992,1994 The University of Utah and - * the Computer Systems Laboratory (CSL). All rights reserved. - * - * THE UNIVERSITY OF UTAH AND CSL PROVIDE THIS SOFTWARE IN ITS "AS IS" - * CONDITION, AND DISCLAIM ANY LIABILITY OF ANY KIND FOR ANY DAMAGES - * WHATSOEVER RESULTING FROM ITS USE. - * - * CSL requests users of this software to return to csl-dist@cs.utah.edu any - * improvements that they make and grant CSL redistribution rights. - * - * Utah $Hdr: locore.s 1.62 94/12/15$ - */ /* * (c) Copyright 1988 HEWLETT-PACKARD COMPANY * @@ -60,6 +47,27 @@ * Hewlett-Packard Company makes no representations about the * suitability of this software for any purpose. */ +/* + * Copyright (c) 1990,1991,1992,1994 The University of Utah and + * the Computer Systems Laboratory (CSL). All rights reserved. + * + * Permission to use, copy, modify and distribute this software is hereby + * granted provided that (1) source code retains these copyright, permission, + * and disclaimer notices, and (2) redistributions including binaries + * reproduce the notices in supporting documentation, and (3) all advertising + * materials mentioning features or use of this software display the following + * acknowledgement: ``This product includes software developed by the + * Computer Systems Laboratory at the University of Utah.'' + * + * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS + * IS" CONDITION. THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF + * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. + * + * CSL requests users of this software to return to csl-dist@cs.utah.edu any + * improvements that they make and grant CSL redistribution rights. + * + * Utah $Hdr: locore.s 1.63 95/01/20$ + */ #include #include -- cgit v1.2.3