PERFORCE change 135591 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sun Feb 17 12:42:38 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=135591
Change 135591 by marcel at marcel_xcllnt on 2008/02/17 20:42:36
IFC @135590
Affected files ...
.. //depot/projects/e500/sbin/mount/getmntopts.3#2 integrate
.. //depot/projects/e500/sys/boot/powerpc/uboot/start.S#6 integrate
Differences ...
==== //depot/projects/e500/sbin/mount/getmntopts.3#2 (text+ko) ====
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)getmntopts.3 8.3 (Berkeley) 3/30/95
-.\" $FreeBSD: src/sbin/mount/getmntopts.3,v 1.14 2005/11/24 14:27:53 ru Exp $
+.\" $FreeBSD: src/sbin/mount/getmntopts.3,v 1.15 2008/02/17 20:25:25 yar Exp $
.\"
-.Dd March 30, 1995
+.Dd February 17, 2008
.Dt GETMNTOPTS 3
.Os
.Sh NAME
@@ -163,10 +163,11 @@
.Sh DIAGNOSTICS
If the external integer variable
.Va getmnt_silent
-is non-zero then the
+is zero, then the
.Fn getmntopts
function displays an error message and exits if an
unrecognized option is encountered.
+Otherwise unrecognized options are silently ignored.
By default
.Va getmnt_silent
is zero.
==== //depot/projects/e500/sys/boot/powerpc/uboot/start.S#6 (text+ko) ====
@@ -22,11 +22,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: src/sys/boot/powerpc/uboot/start.S,v 1.2 2008/02/17 20:38:22 marcel Exp $
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/powerpc/uboot/start.S,v 1.1 2008/02/16 22:40:55 marcel Exp $");
-
#include <machine/asm.h>
#define STACK_SIZE 8192
More information about the p4-projects
mailing list