From c73a98e05ae20b8b78d878adb073a0ab3fc48bd8 Mon Sep 17 00:00:00 2001 From: obrien Date: Sun, 4 Jan 2004 23:21:18 +0000 Subject: Convert to __FBSDID. --- sys/boot/alpha/common/conf.c | 5 +++-- sys/boot/alpha/common/main.c | 4 ++-- sys/boot/alpha/libalpha/OSFpal.c | 7 ++++--- sys/boot/alpha/libalpha/alpha_copy.c | 6 ++++-- sys/boot/alpha/libalpha/alpha_module.c | 5 +++-- sys/boot/alpha/libalpha/bootinfo.c | 5 +++-- sys/boot/alpha/libalpha/delay.c | 5 +++-- sys/boot/alpha/libalpha/devicename.c | 5 +++-- sys/boot/alpha/libalpha/elf_freebsd.c | 5 +++-- sys/boot/alpha/libalpha/getsecs.c | 6 ++++-- sys/boot/alpha/libalpha/prom.c | 4 +++- sys/boot/alpha/libalpha/reboot.c | 5 +++-- sys/boot/alpha/libalpha/srmdisk.c | 6 +++--- sys/boot/alpha/libalpha/srmnet.c | 6 ++++-- sys/boot/alpha/libalpha/time.c | 5 +++-- sys/boot/powerpc/loader/conf.c | 5 +++-- sys/boot/powerpc/loader/metadata.c | 4 +++- sys/boot/powerpc/loader/start.c | 5 +++-- sys/boot/powerpc/ofw/conf.c | 5 +++-- sys/boot/powerpc/ofw/metadata.c | 4 +++- sys/boot/powerpc/ofw/start.c | 5 +++-- sys/boot/sparc64/boot1/boot1.c | 1 - sys/boot/sparc64/loader/main.c | 6 ++++-- sys/boot/sparc64/loader/metadata.c | 4 +++- 24 files changed, 73 insertions(+), 45 deletions(-) diff --git a/sys/boot/alpha/common/conf.c b/sys/boot/alpha/common/conf.c index 8db3ff7..26a36f7 100644 --- a/sys/boot/alpha/common/conf.c +++ b/sys/boot/alpha/common/conf.c @@ -22,10 +22,11 @@ * 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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include "libalpha/libalpha.h" #ifdef LOADER_NET_SUPPORT diff --git a/sys/boot/alpha/common/main.c b/sys/boot/alpha/common/main.c index 8b5fcff..9b8c072 100644 --- a/sys/boot/alpha/common/main.c +++ b/sys/boot/alpha/common/main.c @@ -23,10 +23,10 @@ * 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$ */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/boot/alpha/libalpha/OSFpal.c b/sys/boot/alpha/libalpha/OSFpal.c index 9a0ee35..1c61f80 100644 --- a/sys/boot/alpha/libalpha/OSFpal.c +++ b/sys/boot/alpha/libalpha/OSFpal.c @@ -1,8 +1,6 @@ /* - * $FreeBSD$ - * From $NetBSD: OSFpal.c,v 1.5 1998/06/24 01:33:19 ross Exp $ + * $NetBSD: OSFpal.c,v 1.5 1998/06/24 01:33:19 ross Exp $ */ - /* * Copyright (c) 1994, 1996 Carnegie-Mellon University. * All rights reserved. @@ -30,6 +28,9 @@ * rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD$"); + #include #include diff --git a/sys/boot/alpha/libalpha/alpha_copy.c b/sys/boot/alpha/libalpha/alpha_copy.c index 12f56b1..6c8c683 100644 --- a/sys/boot/alpha/libalpha/alpha_copy.c +++ b/sys/boot/alpha/libalpha/alpha_copy.c @@ -22,9 +22,11 @@ * 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$ */ + +#include +__FBSDID("$FreeBSD$"); + /* * MD primitives supporting placement of module data * diff --git a/sys/boot/alpha/libalpha/alpha_module.c b/sys/boot/alpha/libalpha/alpha_module.c index 4ac21d4..804d484 100644 --- a/sys/boot/alpha/libalpha/alpha_module.c +++ b/sys/boot/alpha/libalpha/alpha_module.c @@ -22,10 +22,11 @@ * 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$ */ +#include +__FBSDID("$FreeBSD$"); + /* * alpha-specific module functionality. * diff --git a/sys/boot/alpha/libalpha/bootinfo.c b/sys/boot/alpha/libalpha/bootinfo.c index cb41bfb..106ad45 100644 --- a/sys/boot/alpha/libalpha/bootinfo.c +++ b/sys/boot/alpha/libalpha/bootinfo.c @@ -22,10 +22,11 @@ * 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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/boot/alpha/libalpha/delay.c b/sys/boot/alpha/libalpha/delay.c index faaf982..6e437a7 100644 --- a/sys/boot/alpha/libalpha/delay.c +++ b/sys/boot/alpha/libalpha/delay.c @@ -22,10 +22,11 @@ * 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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include diff --git a/sys/boot/alpha/libalpha/devicename.c b/sys/boot/alpha/libalpha/devicename.c index d8ee113..9c0d6aa 100644 --- a/sys/boot/alpha/libalpha/devicename.c +++ b/sys/boot/alpha/libalpha/devicename.c @@ -22,10 +22,11 @@ * 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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/boot/alpha/libalpha/elf_freebsd.c b/sys/boot/alpha/libalpha/elf_freebsd.c index a223652..11115b7 100644 --- a/sys/boot/alpha/libalpha/elf_freebsd.c +++ b/sys/boot/alpha/libalpha/elf_freebsd.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -37,7 +36,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -76,6 +74,9 @@ * @(#)boot.c 8.1 (Berkeley) 6/10/93 */ +#include +__FBSDID("$FreeBSD$"); + #include #include diff --git a/sys/boot/alpha/libalpha/getsecs.c b/sys/boot/alpha/libalpha/getsecs.c index 13f1e53..18c8770 100644 --- a/sys/boot/alpha/libalpha/getsecs.c +++ b/sys/boot/alpha/libalpha/getsecs.c @@ -1,8 +1,10 @@ /* - * $FreeBSD$ - * From: $NetBSD: getsecs.c,v 1.5 1998/01/05 07:02:49 perry Exp $ + * $NetBSD: getsecs.c,v 1.5 1998/01/05 07:02:49 perry Exp $ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/boot/alpha/libalpha/prom.c b/sys/boot/alpha/libalpha/prom.c index e32d43d..0ee3b6d 100644 --- a/sys/boot/alpha/libalpha/prom.c +++ b/sys/boot/alpha/libalpha/prom.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */ /* @@ -27,6 +26,9 @@ * the rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD$"); + #include #include diff --git a/sys/boot/alpha/libalpha/reboot.c b/sys/boot/alpha/libalpha/reboot.c index 3361c6c..f8de561 100644 --- a/sys/boot/alpha/libalpha/reboot.c +++ b/sys/boot/alpha/libalpha/reboot.c @@ -22,10 +22,11 @@ * 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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include diff --git a/sys/boot/alpha/libalpha/srmdisk.c b/sys/boot/alpha/libalpha/srmdisk.c index fc96872..2ad458a 100644 --- a/sys/boot/alpha/libalpha/srmdisk.c +++ b/sys/boot/alpha/libalpha/srmdisk.c @@ -23,10 +23,11 @@ * 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$ */ +#include +__FBSDID("$FreeBSD$"); + /* * SRM disk device handling. * @@ -34,7 +35,6 @@ * * - NetBSD libi386/biosdisk.c * - FreeBSD biosboot/disk.c - * */ #include diff --git a/sys/boot/alpha/libalpha/srmnet.c b/sys/boot/alpha/libalpha/srmnet.c index 969b378..7a76284 100644 --- a/sys/boot/alpha/libalpha/srmnet.c +++ b/sys/boot/alpha/libalpha/srmnet.c @@ -1,6 +1,5 @@ /* - * $FreeBSD$ - * From: $NetBSD: if_prom.c,v 1.10 1997/09/06 14:08:33 drochner Exp $ + * $NetBSD: if_prom.c,v 1.10 1997/09/06 14:08:33 drochner Exp $ */ /* @@ -35,6 +34,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + #include #include diff --git a/sys/boot/alpha/libalpha/time.c b/sys/boot/alpha/libalpha/time.c index 18af172..73987c8 100644 --- a/sys/boot/alpha/libalpha/time.c +++ b/sys/boot/alpha/libalpha/time.c @@ -22,10 +22,11 @@ * 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$ */ +#include +__FBSDID("$FreeBSD$"); + #include /* diff --git a/sys/boot/powerpc/loader/conf.c b/sys/boot/powerpc/loader/conf.c index 22027b6..d214d1e 100644 --- a/sys/boot/powerpc/loader/conf.c +++ b/sys/boot/powerpc/loader/conf.c @@ -22,10 +22,11 @@ * 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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include "bootstrap.h" #include "libofw.h" diff --git a/sys/boot/powerpc/loader/metadata.c b/sys/boot/powerpc/loader/metadata.c index bb02c5e..e11c81b 100644 --- a/sys/boot/powerpc/loader/metadata.c +++ b/sys/boot/powerpc/loader/metadata.c @@ -24,9 +24,11 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.6 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/boot/powerpc/loader/start.c b/sys/boot/powerpc/loader/start.c index dced920..9f82322 100644 --- a/sys/boot/powerpc/loader/start.c +++ b/sys/boot/powerpc/loader/start.c @@ -1,6 +1,4 @@ -/* $FreeBSD$ */ /* $NetBSD: Locore.c,v 1.7 2000/08/20 07:04:59 tsubai Exp $ */ - /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. * Copyright (C) 1995, 1996 TooLs GmbH. @@ -32,6 +30,9 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + #include #include "libofw.h" diff --git a/sys/boot/powerpc/ofw/conf.c b/sys/boot/powerpc/ofw/conf.c index 22027b6..d214d1e 100644 --- a/sys/boot/powerpc/ofw/conf.c +++ b/sys/boot/powerpc/ofw/conf.c @@ -22,10 +22,11 @@ * 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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include "bootstrap.h" #include "libofw.h" diff --git a/sys/boot/powerpc/ofw/metadata.c b/sys/boot/powerpc/ofw/metadata.c index bb02c5e..e11c81b 100644 --- a/sys/boot/powerpc/ofw/metadata.c +++ b/sys/boot/powerpc/ofw/metadata.c @@ -24,9 +24,11 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.6 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/boot/powerpc/ofw/start.c b/sys/boot/powerpc/ofw/start.c index dced920..9f82322 100644 --- a/sys/boot/powerpc/ofw/start.c +++ b/sys/boot/powerpc/ofw/start.c @@ -1,6 +1,4 @@ -/* $FreeBSD$ */ /* $NetBSD: Locore.c,v 1.7 2000/08/20 07:04:59 tsubai Exp $ */ - /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. * Copyright (C) 1995, 1996 TooLs GmbH. @@ -32,6 +30,9 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + #include #include "libofw.h" diff --git a/sys/boot/sparc64/boot1/boot1.c b/sys/boot/sparc64/boot1/boot1.c index 1b1c1ec..685e33f 100644 --- a/sys/boot/sparc64/boot1/boot1.c +++ b/sys/boot/sparc64/boot1/boot1.c @@ -13,7 +13,6 @@ * implied warranties, including, without limitation, the implied * warranties of merchantability and fitness for a particular * purpose. - * */ #include diff --git a/sys/boot/sparc64/loader/main.c b/sys/boot/sparc64/loader/main.c index ddf804a..95790f1 100644 --- a/sys/boot/sparc64/loader/main.c +++ b/sys/boot/sparc64/loader/main.c @@ -5,9 +5,11 @@ * * As long as the above copyright statement and this notice remain * unchanged, you can do what ever you want with this file. - * - * $FreeBSD$ */ + +#include +__FBSDID("$FreeBSD$"); + /* * FreeBSD/sparc64 kernel loader - machine dependent part * diff --git a/sys/boot/sparc64/loader/metadata.c b/sys/boot/sparc64/loader/metadata.c index 9bb8af0..cfb9879 100644 --- a/sys/boot/sparc64/loader/metadata.c +++ b/sys/boot/sparc64/loader/metadata.c @@ -24,9 +24,11 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.29 - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include -- cgit v1.1