Date: Fri, 10 Jul 2015 09:15:07 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r285354 - head/sys/i386/include Message-ID: <201507100915.t6A9F7Jv048458@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Fri Jul 10 09:15:06 2015 New Revision: 285354 URL: https://svnweb.freebsd.org/changeset/base/285354 Log: Duplicate the copyright from the i386/i386/machdep.c into i386/include/frame.h after a code was moved from machdep.c to frame.h in r284925. Use include guards style similar to other guards. Noted by: bde Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/i386/include/frame.h Modified: head/sys/i386/include/frame.h ============================================================================== --- head/sys/i386/include/frame.h Fri Jul 10 08:54:12 2015 (r285353) +++ head/sys/i386/include/frame.h Fri Jul 10 09:15:06 2015 (r285354) @@ -1,14 +1,44 @@ /*- - * This file is in the public domain. + * Copyright (c) 2003 Peter Wemm. + * Copyright (c) 1990 The Regents of the University of California. + * All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * William Jolitz. + * + * 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. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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. + * + * $FreeBSD$ */ -/* $FreeBSD$ */ -#include <x86/frame.h> +#ifndef _I386_FRAME_H_ +#define _I386_FRAME_H_ -#ifndef __I386_FRAME_H__ -#define __i386_FRAME_H__ +#include <x86/frame.h> #define CS_SECURE(cs) (ISPL(cs) == SEL_UPL) #define EFL_SECURE(ef, oef) ((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0) -#endif +#endif /* _I386_FRAME_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507100915.t6A9F7Jv048458>