From owner-svn-src-all@FreeBSD.ORG Sun Jun 3 11:54:26 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B8307106566B; Sun, 3 Jun 2012 11:54:26 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 88B278FC15; Sun, 3 Jun 2012 11:54:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q53BsQUL059477; Sun, 3 Jun 2012 11:54:26 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q53BsQCR059473; Sun, 3 Jun 2012 11:54:26 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201206031154.q53BsQCR059473@svn.freebsd.org> From: Marius Strobl Date: Sun, 3 Jun 2012 11:54:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r236511 - stable/9/sys/powerpc/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2012 11:54:26 -0000 Author: marius Date: Sun Jun 3 11:54:26 2012 New Revision: 236511 URL: http://svn.freebsd.org/changeset/base/236511 Log: MFC: r233635 Allow multiple inclusion of trap.h. This has always been broken, but until recently never caused problems. Modified: stable/9/sys/powerpc/include/trap.h stable/9/sys/powerpc/include/trap_aim.h stable/9/sys/powerpc/include/trap_booke.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/dev/e1000/ (props changed) stable/9/sys/dev/ixgbe/ (props changed) stable/9/sys/fs/ (props changed) stable/9/sys/fs/ntfs/ (props changed) stable/9/sys/modules/ (props changed) Modified: stable/9/sys/powerpc/include/trap.h ============================================================================== --- stable/9/sys/powerpc/include/trap.h Sun Jun 3 11:31:45 2012 (r236510) +++ stable/9/sys/powerpc/include/trap.h Sun Jun 3 11:54:26 2012 (r236511) @@ -6,7 +6,3 @@ #include #endif -#ifndef LOCORE -struct trapframe; -void trap(struct trapframe *); -#endif Modified: stable/9/sys/powerpc/include/trap_aim.h ============================================================================== --- stable/9/sys/powerpc/include/trap_aim.h Sun Jun 3 11:31:45 2012 (r236510) +++ stable/9/sys/powerpc/include/trap_aim.h Sun Jun 3 11:54:26 2012 (r236511) @@ -119,4 +119,9 @@ #define EXC_PGM_PRIV (1UL << 18) #define EXC_PGM_TRAP (1UL << 17) +#ifndef LOCORE +struct trapframe; +void trap(struct trapframe *); +#endif + #endif /* _POWERPC_TRAP_H_ */ Modified: stable/9/sys/powerpc/include/trap_booke.h ============================================================================== --- stable/9/sys/powerpc/include/trap_booke.h Sun Jun 3 11:31:45 2012 (r236510) +++ stable/9/sys/powerpc/include/trap_booke.h Sun Jun 3 11:54:26 2012 (r236511) @@ -52,4 +52,9 @@ #define EXC_LAST 255 +#ifndef LOCORE +struct trapframe; +void trap(struct trapframe *); +#endif + #endif /* _POWERPC_TRAP_H_ */