Date: Sun, 29 Dec 2002 23:15:31 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 22914 for review Message-ID: <200212300715.gBU7FV1n057014@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=22914 Change 22914 by marcel@marcel_vaio on 2002/12/29 23:14:41 IFC @22912 Affected files ... .. //depot/projects/ia64/sbin/swapon/swapon.c#6 integrate .. //depot/projects/ia64/share/man/man5/msdosfs.5#2 integrate .. //depot/projects/ia64/sys/vm/vm_kern.c#19 integrate .. //depot/projects/ia64/usr.sbin/mixer/mixer.c#2 integrate Differences ... ==== //depot/projects/ia64/sbin/swapon/swapon.c#6 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)swapon.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/swapon/swapon.c,v 1.14 2002/12/28 23:39:47 dillon Exp $"; + "$FreeBSD: src/sbin/swapon/swapon.c,v 1.15 2002/12/30 05:35:06 mike Exp $"; #endif /* not lint */ #include <sys/stat.h> @@ -210,8 +210,8 @@ { size_t mibsize, size; struct xswdev xsw; - int mib[16], n, pagesize; - size_t hlen; + int hlen, mib[16], n, pagesize; + size_t hsize; long blocksize; long long total = 0; long long used = 0; @@ -229,7 +229,8 @@ hlen = 10; break; default: - getbsize(&hlen, &blocksize); + getbsize(&hsize, &blocksize); + hlen = hsize; break; } ==== //depot/projects/ia64/share/man/man5/msdosfs.5#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man5/msdosfs.5,v 1.1 2002/12/29 21:32:41 trhodes Exp $ +.\" $FreeBSD: src/share/man/man5/msdosfs.5,v 1.2 2002/12/30 04:32:10 trhodes Exp $ .\" Written by Tom Rhodes .\" This file is in the public domain. .\" @@ -10,7 +10,7 @@ .Nd msdos file system .Sh SYNOPSIS .Bd -literal -/dev/ad0sN /dos msdos rw 0 0 +/dev/ad0sN /dos msdosfs rw 0 0 .Ed .Pp To link into the kernel: @@ -46,7 +46,7 @@ .Pa /etc/fstab that looks similar to: .Bd -literal -/dev/ad0sN /dos msdos rw 0 0 +/dev/ad0sN /dos msdosfs rw 0 0 .Ed .Pp This will mount an ==== //depot/projects/ia64/sys/vm/vm_kern.c#19 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_kern.c,v 1.93 2002/12/28 19:03:54 alc Exp $ + * $FreeBSD: src/sys/vm/vm_kern.c,v 1.94 2002/12/30 05:55:41 alc Exp $ */ /* @@ -524,11 +524,11 @@ vm_map_t m; m = vm_map_create(kernel_pmap, VM_MIN_KERNEL_ADDRESS, end); + m->system_map = 1; vm_map_lock(m); /* N.B.: cannot use kgdb to debug, starting with this assignment ... */ kernel_map = m; - kernel_map->system_map = 1; - (void) vm_map_insert(m, NULL, (vm_offset_t) 0, + (void) vm_map_insert(m, NULL, (vm_ooffset_t) 0, VM_MIN_KERNEL_ADDRESS, start, VM_PROT_ALL, VM_PROT_ALL, 0); /* ... and ending with the completion of the above `insert' */ vm_map_unlock(m); ==== //depot/projects/ia64/usr.sbin/mixer/mixer.c#2 (text+ko) ==== @@ -13,7 +13,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/usr.sbin/mixer/mixer.c,v 1.16 2001/06/25 21:06:15 dd Exp $"; + "$FreeBSD: src/usr.sbin/mixer/mixer.c,v 1.17 2002/12/30 04:23:08 jmallett Exp $"; #endif /* not lint */ #include <err.h> @@ -217,8 +217,14 @@ else if (r > 100) r = 100; - printf("Setting the mixer %s to %d:%d.\n", names[dev], - l, r); + if (ioctl(baz, MIXER_READ(dev),&bar)== -1) { + warn("MIXER_READ"); + argc--; argv++; + continue; + } + + printf("Setting the mixer %s from %d:%d to %d:%d.\n", + names[dev], bar & 0x7f, (bar >> 8) & 0x7f, l, r); l |= r << 8; if (ioctl(baz, MIXER_WRITE(dev), &l) == -1) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212300715.gBU7FV1n057014>