From c5a02534d6c96c6add9d2052abb34c2c8e3d0397 Mon Sep 17 00:00:00 2001 From: mickey Date: Tue, 26 Mar 1996 15:38:45 +0000 Subject: [PATCH] Somehow happened to coexist two versions of this in the same file. fixed, older removed. --- sys/sys/cpu.h | 62 +-------------------------------------------------- 1 file changed, 1 insertion(+), 61 deletions(-) diff --git a/sys/sys/cpu.h b/sys/sys/cpu.h index 807ab4cee43..10e75d21977 100644 --- a/sys/sys/cpu.h +++ b/sys/sys/cpu.h @@ -1,64 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.2 1996/03/03 12:11:29 niklas Exp $ */ -/* $NetBSD: cpu.h,v 1.3 1996/02/14 21:49:49 christos Exp $ */ - -/* - * Copyright (c) 1996 Christos Zoulas. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Christos Zoulas. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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. - */ - -#ifdef _KERNEL -struct proc; -struct vnode; -struct code; -struct ucred; -struct core; -struct buf; -struct disklabel; -struct device; -struct disk; -__BEGIN_DECLS - -void consinit __P((void)); -void boot __P((int)); -void pagemove __P((caddr_t, caddr_t, size_t)); -void delay __P((unsigned)); -int bounds_check_with_label __P((struct buf *, struct disklabel *, int)); -int dk_establish __P((struct disk *, struct device *)); - - -void cpu_exit __P((struct proc *)); -void cpu_startup __P((void)); -void cpu_initclocks __P((void)); -void cpu_switch __P((struct proc *)); -int cpu_coredump __P((struct proc *, struct vnode *, struct ucred *, - struct core *)); -__END_DECLS - -#endif /* _KERNEL */ +/* $OpenBSD: cpu.h,v 1.3 1996/03/26 15:38:45 mickey Exp $ */ /* $NetBSD: cpu.h,v 1.4 1996/02/16 17:25:46 gwr Exp $ */ /* -- 2.20.1