diff --git a/sys/geom/geom_aes.c b/sys/geom/geom_aes.c index 7698364baf69..867efd9fdaa8 100644 --- a/sys/geom/geom_aes.c +++ b/sys/geom/geom_aes.c @@ -32,14 +32,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ - * * This method provides AES encryption with a compiled in key (default * all zeroes). * * XXX: This could probably save a lot of code by pretending to be a slicer. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/geom/geom_apple.c b/sys/geom/geom_apple.c index 8146d67e997d..328b8353989c 100644 --- a/sys/geom/geom_apple.c +++ b/sys/geom/geom_apple.c @@ -1,5 +1,4 @@ /*- - * * Copyright (c) 2002 Peter Grehan. * All rights reserved. * @@ -23,8 +22,6 @@ * 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$ */ /* @@ -33,6 +30,9 @@ * The Structure of Block Devices" */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/geom/geom_bsd.c b/sys/geom/geom_bsd.c index 464bfc155bcb..4f4d5659339c 100644 --- a/sys/geom/geom_bsd.c +++ b/sys/geom/geom_bsd.c @@ -32,13 +32,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ - * * This is the method for dealing with BSD disklabels. It has been * extensively (by my standards at least) commented, in the vain hope that * it will serve as the source in future copy&paste operations. */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/geom/geom_bsd_enc.c b/sys/geom/geom_bsd_enc.c index c82ea6e14bce..dfdeb8555fea 100644 --- a/sys/geom/geom_bsd_enc.c +++ b/sys/geom/geom_bsd_enc.c @@ -32,15 +32,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ - * * Functions to encode and decode struct disklabel and struct partition into * a bytestream of little endianess and correct packing. * * NB! This file must be usable both in kernel and userland. - * */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c index ad5b505771fe..51f70c355846 100644 --- a/sys/geom/geom_ccd.c +++ b/sys/geom/geom_ccd.c @@ -45,14 +45,13 @@ * Moffett Field, CA 94035 * * from: Utah $Hdr: cd.c 1.6 90/11/28$ - * * @(#)cd.c 8.2 (Berkeley) 11/16/93 - * * $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c index e135237848ac..d543129beaa7 100644 --- a/sys/geom/geom_ctl.c +++ b/sys/geom/geom_ctl.c @@ -31,10 +31,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 "opt_geom.h" #include diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c index a00ce6ae8f37..2dc713a456ea 100644 --- a/sys/geom/geom_dev.c +++ b/sys/geom/geom_dev.c @@ -31,10 +31,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/geom/geom_disk.c b/sys/geom/geom_disk.c index 5bbb56d1d86a..9b5f79e86f46 100644 --- a/sys/geom/geom_disk.c +++ b/sys/geom/geom_disk.c @@ -31,10 +31,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 "opt_geom.h" #include diff --git a/sys/geom/geom_dump.c b/sys/geom/geom_dump.c index a21a6bc3c488..869d7c40b483 100644 --- a/sys/geom/geom_dump.c +++ b/sys/geom/geom_dump.c @@ -31,10 +31,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/geom/geom_event.c b/sys/geom/geom_event.c index 12092e479021..f180c4345f59 100644 --- a/sys/geom/geom_event.c +++ b/sys/geom/geom_event.c @@ -31,8 +31,6 @@ * 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$ */ /* @@ -40,6 +38,9 @@ * have not been destroyed before we get around to handle the event ? */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/geom/geom_gpt.c b/sys/geom/geom_gpt.c index 5fdf74dc1314..52951c4c5442 100644 --- a/sys/geom/geom_gpt.c +++ b/sys/geom/geom_gpt.c @@ -27,10 +27,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/geom/geom_io.c b/sys/geom/geom_io.c index 27a8859a4e04..890d080d5bfa 100644 --- a/sys/geom/geom_io.c +++ b/sys/geom/geom_io.c @@ -31,10 +31,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/geom/geom_kern.c b/sys/geom/geom_kern.c index fd811cca6aa6..6c0c2897bef1 100644 --- a/sys/geom/geom_kern.c +++ b/sys/geom/geom_kern.c @@ -31,10 +31,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/geom/geom_mbr.c b/sys/geom/geom_mbr.c index 46f1e15da727..3abcf769860a 100644 --- a/sys/geom/geom_mbr.c +++ b/sys/geom/geom_mbr.c @@ -28,10 +28,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/geom/geom_mbr_enc.c b/sys/geom/geom_mbr_enc.c index b5d560a104dc..da5f99779012 100644 --- a/sys/geom/geom_mbr_enc.c +++ b/sys/geom/geom_mbr_enc.c @@ -23,16 +23,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ - * * Functions to encode or decode struct dos_partition into a bytestream * of correct endianess and packing. These functions do no validation * or sanity checking, they only pack/unpack the fields correctly. * * NB! This file must be usable both in kernel and userland. - * */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/geom/geom_mirror.c b/sys/geom/geom_mirror.c index 09e7f549486b..98111c52afe0 100644 --- a/sys/geom/geom_mirror.c +++ b/sys/geom/geom_mirror.c @@ -25,11 +25,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/geom/geom_pc98.c b/sys/geom/geom_pc98.c index 9d113c6199f7..b6d2c2113d53 100644 --- a/sys/geom/geom_pc98.c +++ b/sys/geom/geom_pc98.c @@ -28,10 +28,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/geom/geom_pc98_enc.c b/sys/geom/geom_pc98_enc.c index 5424ea4e5a6b..04de22043677 100644 --- a/sys/geom/geom_pc98_enc.c +++ b/sys/geom/geom_pc98_enc.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/geom/geom_slice.c b/sys/geom/geom_slice.c index 9342f119513f..64c000e23c2d 100644 --- a/sys/geom/geom_slice.c +++ b/sys/geom/geom_slice.c @@ -31,10 +31,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/geom/geom_subr.c b/sys/geom/geom_subr.c index 3489c336d5aa..98b8f8f4c32a 100644 --- a/sys/geom/geom_subr.c +++ b/sys/geom/geom_subr.c @@ -31,10 +31,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/geom/geom_sunlabel.c b/sys/geom/geom_sunlabel.c index cfade355e641..0718056a31a3 100644 --- a/sys/geom/geom_sunlabel.c +++ b/sys/geom/geom_sunlabel.c @@ -31,10 +31,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/geom/geom_sunlabel_enc.c b/sys/geom/geom_sunlabel_enc.c index f2b5df31a628..d153e11c6222 100644 --- a/sys/geom/geom_sunlabel_enc.c +++ b/sys/geom/geom_sunlabel_enc.c @@ -24,15 +24,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ - * * Functions to encode or decode struct sun_disklabel into a bytestream * of correct endianess and packing. * * NB! This file must be usable both in kernel and userland. - * */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/geom/geom_vol_ffs.c b/sys/geom/geom_vol_ffs.c index 4979bc91b97c..de046edd78a0 100644 --- a/sys/geom/geom_vol_ffs.c +++ b/sys/geom/geom_vol_ffs.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