[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

[zrouter-src-freebsd at zrouter.org]

details:   http://zrouter.org/hg/FreeBSD/head//rev/b35ed53dbff9
changeset: 314:b35ed53dbff9
user:      ray at terran.dlink.ua
date:      Wed Feb 01 11:33:29 2012 +0200
description:
Update sys/geom

diffstat:

 head/sys/geom/geom_bsd.c            |  3 ++-
 head/sys/geom/geom_mbr.c            |  3 ++-
 head/sys/geom/geom_pc98.c           |  3 ++-
 head/sys/geom/mountver/g_mountver.c |  3 ++-
 head/sys/geom/part/g_part_mbr.c     |  3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diffs (100 lines):

diff -r 1b729d3573af -r b35ed53dbff9 head/sys/geom/geom_bsd.c
--- a/head/sys/geom/geom_bsd.c	Wed Feb 01 11:33:08 2012 +0200
+++ b/head/sys/geom/geom_bsd.c	Wed Feb 01 11:33:29 2012 +0200
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/geom/geom_bsd.c 223921 2011-07-11 05:22:31Z ae $");
+__FBSDID("$FreeBSD: head/sys/geom/geom_bsd.c 230643 2012-01-28 14:00:21Z attilio $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
@@ -57,6 +57,7 @@
 #include <sys/errno.h>
 #include <sys/disklabel.h>
 #include <sys/gpt.h>
+#include <sys/proc.h>
 #include <sys/sbuf.h>
 #include <sys/uuid.h>
 #include <geom/geom.h>
diff -r 1b729d3573af -r b35ed53dbff9 head/sys/geom/geom_mbr.c
--- a/head/sys/geom/geom_mbr.c	Wed Feb 01 11:33:08 2012 +0200
+++ b/head/sys/geom/geom_mbr.c	Wed Feb 01 11:33:29 2012 +0200
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/geom/geom_mbr.c 230643 2012-01-28 14:00:21Z attilio $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
@@ -45,6 +45,7 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/md5.h>
+#include <sys/proc.h>
 
 #include <sys/diskmbr.h>
 #include <sys/sbuf.h>
diff -r 1b729d3573af -r b35ed53dbff9 head/sys/geom/geom_pc98.c
--- a/head/sys/geom/geom_pc98.c	Wed Feb 01 11:33:08 2012 +0200
+++ b/head/sys/geom/geom_pc98.c	Wed Feb 01 11:33:29 2012 +0200
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/geom/geom_pc98.c 223921 2011-07-11 05:22:31Z ae $");
+__FBSDID("$FreeBSD: head/sys/geom/geom_pc98.c 230643 2012-01-28 14:00:21Z attilio $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
@@ -43,6 +43,7 @@
 #include <sys/bio.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/sbuf.h>
 
 #include <sys/diskpc98.h>
diff -r 1b729d3573af -r b35ed53dbff9 head/sys/geom/mountver/g_mountver.c
--- a/head/sys/geom/mountver/g_mountver.c	Wed Feb 01 11:33:08 2012 +0200
+++ b/head/sys/geom/mountver/g_mountver.c	Wed Feb 01 11:33:29 2012 +0200
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/geom/mountver/g_mountver.c 227309 2011-11-07 15:43:11Z ed $");
+__FBSDID("$FreeBSD: head/sys/geom/mountver/g_mountver.c 230643 2012-01-28 14:00:21Z attilio $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -36,6 +36,7 @@
 #include <sys/mutex.h>
 #include <sys/bio.h>
 #include <sys/disk.h>
+#include <sys/proc.h>
 #include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
diff -r 1b729d3573af -r b35ed53dbff9 head/sys/geom/part/g_part_mbr.c
--- a/head/sys/geom/part/g_part_mbr.c	Wed Feb 01 11:33:08 2012 +0200
+++ b/head/sys/geom/part/g_part_mbr.c	Wed Feb 01 11:33:29 2012 +0200
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/geom/part/g_part_mbr.c 230064 2012-01-13 18:32:56Z truckman $");
+__FBSDID("$FreeBSD: head/sys/geom/part/g_part_mbr.c 230522 2012-01-25 03:37:39Z nwhitehorn $");
 
 #include <sys/param.h>
 #include <sys/bio.h>
@@ -123,6 +123,7 @@
 	{ DOSPTYP_LINUX,	G_PART_ALIAS_LINUX_DATA },
 	{ DOSPTYP_LINLVM,	G_PART_ALIAS_LINUX_LVM },
 	{ DOSPTYP_LINRAID,	G_PART_ALIAS_LINUX_RAID },
+	{ DOSPTYP_PPCBOOT,	G_PART_ALIAS_FREEBSD_BOOT },
 };
 
 static int