PERFORCE change 100457 for review
Kip Macy
kmacy at FreeBSD.org
Mon Jul 3 05:09:01 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=100457
Change 100457 by kmacy at kmacy_storage:sun4v_work_stable on 2006/07/03 05:08:02
integrate @100359 in preparation for integrating latest bike_sched
Affected files ...
.. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/ng_tag.4#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/sched_core.4#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mfi/mfi.c#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mii/tlphy.c#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mii/ukphy.c#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/mii/xmphy.c#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/sio/sio.c#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/if_ural.c#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/i386/i386/pmap.c#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/kern/sched_4bsd.c#4 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/modules/bktr/bktr_mem/Makefile#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/modules/streams/Makefile#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/modules/svr4/Makefile#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/netinet6/in6_cksum.c#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/sys/powerpc/powerpc/mmu_oea.c#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/tools/tools/net80211/wlanwatch/wlanwatch.c#2 integrate
.. //depot/projects/kmacy_sun4v_stable/src/usr.bin/tail/tail.1#3 integrate
.. //depot/projects/kmacy_sun4v_stable/src/usr.bin/tail/tail.c#3 integrate
Differences ...
==== //depot/projects/kmacy_sun4v_stable/src/share/man/man4/ng_tag.4#2 (text+ko) ====
@@ -22,9 +22,10 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/ng_tag.4,v 1.1 2006/06/27 12:45:27 glebius Exp $
+.\" $FreeBSD: src/share/man/man4/ng_tag.4,v 1.2 2006/06/30 11:35:35 ru Exp $
.\"
.Dd June 10, 2006
+.Dt NG_TAG 4
.Os
.Sh NAME
.Nm ng_tag
@@ -217,13 +218,13 @@
tags in conjunction with
.Xr ng_bpf 4
traffic analyzer.
-Let us suppose we need to filter DirectConnect P2P network data traffic,
+Example below explains how to filter DirectConnect P2P network data traffic,
which cannot be done by usual means as it uses random ports.
It is known that such data connection always contains a TCP packet with
6-byte payload string "$Send|".
-So we will use ipfw's
+So ipfw's
.Cm netgraph
-action to divert all TCP packets to an
+action will be used to divert all TCP packets to an
.Xr ng_bpf 4
node which will check for the specified string and return non-matching
packets to
@@ -234,17 +235,17 @@
.Xr ng_bpf 4
node on a hook programmed to accept all packets and pass them back to
.Xr ipfw 8 .
-We will use a script provided in
+A script provided in
.Xr ng_bpf 4
-manual page for programming node.
+manual page will be used for programming node.
Note that packets diverted from
.Xr ipfw 8
to Netgraph have no link-level header, so offsets in
.Xr tcpdump 1
expressions must be altered accordingly.
-Thus, we will have expression
+Thus, there will be expression
.Dq Li "ether[40:2]=0x244c && ether[42:4]=0x6f636b20"
-on incoming from hook and empty expression to match all packets from
+on incoming hook and empty expression to match all packets from
.Xr ng_tag 4 .
.Pp
So, this is
@@ -298,15 +299,15 @@
.Pp
After finishing with
.Xr netgraph 4
-nodes, add
+nodes,
.Xr ipfw 8
-rules to enable packet flow:
+rules must be added to enable packet flow:
.Bd -literal -offset 4n
ipfw add 100 netgraph 41 tcp from any to any iplen 46
ipfw add 110 reset tcp from any to any tagged 412
.Ed
.Pp
-Note: you should ensure that packets are returned to ipfw after processing
+Note: one should ensure that packets are returned to ipfw after processing
inside
.Xr netgraph 4 ,
by setting appropriate
==== //depot/projects/kmacy_sun4v_stable/src/share/man/man4/sched_core.4#2 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/sched_core.4,v 1.2 2006/06/14 08:32:25 joel Exp $
+.\" $FreeBSD: src/share/man/man4/sched_core.4,v 1.3 2006/06/30 07:45:38 delphij Exp $
.\"
-.Dd June 14, 2006
+.Dd June 30, 2006
.Os
.Dt SCHED_CORE 4
.Sh NAME
@@ -46,14 +46,16 @@
.Bl -bullet -compact -offset indent
.It
Nice value of timesharing processes is respected. Allocation of
-timeslice and interaction detection algorithm are based on
+time slice and interaction detection algorithm are based on
nice value.
.It
-Per-cpu scheduling queue and load balancing.
+Per-CPU scheduling queue and load balancing.
.It
O(1) scheduling.
.It
-Some cpu affinity code in wakeup path.
+Some CPU affinity code in wakeup path.
+.It
+Some preliminary support for Hyper Threading Technology.
.It
Support for POSIX SCHED_FIFO and SCHED_RR.
.El
@@ -63,12 +65,22 @@
.Bl -tag -width indent
.It Va kern.sched.name
This read-only sysctl reports the name of the active scheduler.
-.It Va kern.sched.imbalance_pct
-(SMP specific) Lower watermark that triggers thread migration
-if the difference is above this percentage.
-.It Va kern.sched.imbalance_pct2
-(SMP specific) Higher watermark where the current CPU is not
-considered the preferred one for migration.
+.It Va kern.sched.ipiwakeup.enabled
+(SMP specific) Whether to allow forwarding of wakeup to idle CPUs.
+.It Va kern.sched.ipiwakeup.requested
+(SMP specific) Requests for forwarding of wakeup to idle CPUs.
+(read-only).
+.It Va kern.sched.ipiwakeup.requested
+(SMP specific) Completed forwarding of wakeup to idle CPUs.
+(read-only).
+.It Va kern.sched.ipiwakeup.usemask
+(SMP specific) Whether to use the mask of idle CPUs.
+.It Va kern.sched.ipiwakeup.useloop
+(SMP specific) Whether to use loop to find idle CPUs.
+.It Va kern.sched.ipiwakeup.onecpu
+(SMP specific) Whether to only signal one CPU when doing wakeup.
+.It Va kern.sched.ipiwakeup.htt
+(SMP specific) Whether to take Hyper-Threading into account.
.El
.Pp
The
==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/mfi/mfi.c#3 (text) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi.c,v 1.12 2006/06/20 23:08:35 ps Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mfi/mfi.c,v 1.13 2006/06/30 18:59:08 ambrisko Exp $");
#include "opt_mfi.h"
@@ -1296,13 +1296,16 @@
return (error);
}
cm->cm_flags = MFI_CMD_DATAIN;
- cm->cm_complete = mfi_add_ld_complete;
dcmd = &cm->cm_frame->dcmd;
dcmd->mbox[0] = id;
+ if (mfi_wait_command(sc, cm) != 0) {
+ device_printf(sc->mfi_dev,
+ "Failed to get logical drive: %d\n", id);
+ free(ld_info, M_MFIBUF);
+ return (0);
+ }
- mfi_enqueue_ready(cm);
- mfi_startio(sc);
-
+ mfi_add_ld_complete(cm);
return (0);
}
==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/mii/tlphy.c#2 (text+ko) ====
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/tlphy.c,v 1.19 2005/09/30 19:39:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/tlphy.c,v 1.20 2006/07/03 02:53:40 yongari Exp $");
/*
* Driver for Texas Instruments's ThunderLAN PHYs
@@ -140,7 +140,7 @@
device_set_desc(dev, MII_STR_xxTI_TLAN10T);
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/mii/ukphy.c#2 (text+ko) ====
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/ukphy.c,v 1.18 2005/09/30 19:39:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ukphy.c,v 1.19 2006/07/03 02:53:40 yongari Exp $");
/*
* driver for generic unknown PHYs
@@ -121,7 +121,7 @@
* We know something is here, so always match at a low priority.
*/
device_set_desc(dev, "Generic IEEE 802.3u media interface");
- return (-100);
+ return (BUS_PROBE_GENERIC);
}
static int
==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/mii/xmphy.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/xmphy.c,v 1.18 2005/09/30 19:39:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/xmphy.c,v 1.19 2006/07/03 02:53:40 yongari Exp $");
/*
* driver for the XaQti XMAC II's internal PHY. This is sort of
@@ -93,13 +93,13 @@
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxXAQTI &&
MII_MODEL(ma->mii_id2) == MII_MODEL_XAQTI_XMACII) {
device_set_desc(dev, MII_STR_XAQTI_XMACII);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_JATO &&
MII_MODEL(ma->mii_id2) == MII_MODEL_JATO_BASEX) {
device_set_desc(dev, MII_STR_JATO_BASEX);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
return(ENXIO);
==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/sio/sio.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.467 2006/05/26 11:54:32 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.468 2006/06/30 06:27:24 imp Exp $");
#include "opt_comconsole.h"
#include "opt_compat.h"
@@ -700,7 +700,7 @@
device_set_softc(dev, NULL);
free(com, M_DEVBUF);
}
- return (result);
+ return (result == 0 ? BUS_PROBE_DEFAULT : result);
}
/*
@@ -777,7 +777,7 @@
device_set_softc(dev, NULL);
free(com, M_DEVBUF);
}
- return (result);
+ return (result == 0 ? BUS_PROBE_DEFAULT : result);
}
#ifdef COM_ESP
==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/if_ural.c#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $ */
+/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.41 2006/07/01 13:39:04 maxim Exp $ */
/*-
* Copyright (c) 2005, 2006
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.41 2006/07/01 13:39:04 maxim Exp $");
/*-
* Ralink Technology RT2500USB chipset driver
@@ -1746,7 +1746,7 @@
/* dual-band RF */
case RAL_RF_5222:
- for (i = 0; i < ural_rf5222[i].chan != chan; i++);
+ for (i = 0; ural_rf5222[i].chan != chan; i++);
ural_rf_write(sc, RAL_RF1, ural_rf5222[i].r1);
ural_rf_write(sc, RAL_RF2, ural_rf5222[i].r2);
==== //depot/projects/kmacy_sun4v_stable/src/sys/i386/i386/pmap.c#3 (text+ko) ====
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.564 2006/06/27 04:28:23 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.565 2006/07/02 18:22:47 alc Exp $");
/*
* Manages physical address maps.
@@ -1686,9 +1686,9 @@
vm_page_flag_clear(m, PG_WRITEABLE);
m->md.pv_list_count--;
pmap_unuse_pt(pmap, va);
+ free_pv_entry(pmap, pv);
if (pmap != locked_pmap)
PMAP_UNLOCK(pmap);
- free_pv_entry(locked_pmap, pv);
}
}
sched_unpin();
==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_thread.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.233 2006/03/21 10:05:15 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.234 2006/06/30 08:10:55 maxim Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -723,7 +723,7 @@
* There are no threads in user mode. Threads in the kernel must be
* allowed to continue until they get to the user boundary. They may even
* copy out their return values and data before suspending. They may however be
- * accellerated in reaching the user boundary as we will wake up
+ * accelerated in reaching the user boundary as we will wake up
* any sleeping threads that are interruptable. (PCATCH).
*/
int
==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/sched_4bsd.c#4 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.84 2006/06/29 19:37:31 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.86 2006/07/02 20:53:52 maxim Exp $");
#include "opt_hwpmc_hooks.h"
@@ -77,7 +77,7 @@
/*
* The schedulable entity that can be given a context to run.
* A process may have several of these. Probably one per processor
- * but posibly a few more. In this universe they are grouped
+ * but possibly a few more. In this universe they are grouped
* with a KSEG that contains the priority and niceness
* for the group.
*/
@@ -126,9 +126,9 @@
do { \
kg->kg_avail_opennings++; \
CTR3(KTR_RUNQ, "kg %p(%d) Slot released (->%d)", \
- kg, \
- kg->kg_concurrency, \
- kg->kg_avail_opennings); \
+ kg, \
+ kg->kg_concurrency, \
+ kg->kg_avail_opennings); \
/* KASSERT((kg->kg_avail_opennings <= kg->kg_concurrency), \
("slots out of whack"));*/ \
} while (0)
@@ -137,9 +137,9 @@
do { \
kg->kg_avail_opennings--; \
CTR3(KTR_RUNQ, "kg %p(%d) Slot used (->%d)", \
- kg, \
- kg->kg_concurrency, \
- kg->kg_avail_opennings); \
+ kg, \
+ kg->kg_concurrency, \
+ kg->kg_avail_opennings); \
/* KASSERT((kg->kg_avail_opennings >= 0), \
("slots out of whack"));*/ \
} while (0)
@@ -1399,8 +1399,6 @@
ke = td->td_kse;
return (ke->ke_pctcpu);
-
- return (0);
}
void
==== //depot/projects/kmacy_sun4v_stable/src/sys/modules/bktr/bktr_mem/Makefile#2 (text+ko) ====
@@ -1,6 +1,4 @@
-# $FreeBSD: src/sys/modules/bktr/bktr_mem/Makefile,v 1.3 2002/01/11 01:15:58 msmith Exp $
-
-MAINTAINER= roger at freebsd.org
+# $FreeBSD: src/sys/modules/bktr/bktr_mem/Makefile,v 1.4 2006/07/01 10:51:54 markm Exp $
.PATH: ${.CURDIR}/../../../dev/bktr
==== //depot/projects/kmacy_sun4v_stable/src/sys/modules/streams/Makefile#2 (text+ko) ====
@@ -1,5 +1,4 @@
-# $FreeBSD: src/sys/modules/streams/Makefile,v 1.11 2003/11/19 05:08:27 imp Exp $
-MAINTAINER= newton at atdot.dotat.org
+# $FreeBSD: src/sys/modules/streams/Makefile,v 1.12 2006/07/01 10:51:55 markm Exp $
.PATH: ${.CURDIR}/../../dev/streams
==== //depot/projects/kmacy_sun4v_stable/src/sys/modules/svr4/Makefile#2 (text+ko) ====
@@ -1,6 +1,4 @@
-# $FreeBSD: src/sys/modules/svr4/Makefile,v 1.29 2006/01/26 19:21:27 alc Exp $
-
-MAINTAINER= newton at FreeBSD.org
+# $FreeBSD: src/sys/modules/svr4/Makefile,v 1.30 2006/07/01 10:51:55 markm Exp $
.PATH: ${.CURDIR}/../../${MACHINE_ARCH}/svr4 ${.CURDIR}/../../compat/svr4
KMOD= svr4
==== //depot/projects/kmacy_sun4v_stable/src/sys/netinet6/in6_cksum.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/netinet6/in6_cksum.c,v 1.12 2006/01/22 01:17:57 rwatson Exp $ */
+/* $FreeBSD: src/sys/netinet6/in6_cksum.c,v 1.13 2006/06/30 18:25:07 yar Exp $ */
/* $KAME: in6_cksum.c,v 1.10 2000/12/03 00:53:59 itojun Exp $ */
/*-
@@ -153,7 +153,7 @@
/*
* Secondly calculate a summary of the first mbuf excluding offset.
*/
- while (m != NULL && off > 0) {
+ while (off > 0) {
if (m->m_len <= off)
off -= m->m_len;
else
==== //depot/projects/kmacy_sun4v_stable/src/sys/powerpc/powerpc/mmu_oea.c#3 (text+ko) ====
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/mmu_oea.c,v 1.108 2006/06/25 19:07:01 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/mmu_oea.c,v 1.109 2006/07/01 23:24:32 alc Exp $");
/*
* Manages physical address maps.
@@ -1226,7 +1226,6 @@
vm_page_t m;
m = NULL;
- mtx_lock(&Giant);
vm_page_lock_queues();
PMAP_LOCK(pmap);
pvo = moea_pvo_find_va(pmap, va & ~ADDR_POFF, NULL);
@@ -1238,7 +1237,6 @@
}
vm_page_unlock_queues();
PMAP_UNLOCK(pmap);
- mtx_unlock(&Giant);
return (m);
}
@@ -1598,13 +1596,10 @@
("moea_protect: non current pmap"));
if ((prot & VM_PROT_READ) == VM_PROT_NONE) {
- mtx_lock(&Giant);
moea_remove(mmu, pm, sva, eva);
- mtx_unlock(&Giant);
return;
}
- mtx_lock(&Giant);
vm_page_lock_queues();
PMAP_LOCK(pm);
for (; sva < eva; sva += PAGE_SIZE) {
@@ -1636,7 +1631,6 @@
}
vm_page_unlock_queues();
PMAP_UNLOCK(pm);
- mtx_unlock(&Giant);
}
/*
==== //depot/projects/kmacy_sun4v_stable/src/tools/tools/net80211/wlanwatch/wlanwatch.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGES.
*
- * $FreeBSD: src/tools/tools/net80211/wlanwatch/wlanwatch.c,v 1.1 2005/12/11 23:13:54 sam Exp $
+ * $FreeBSD: src/tools/tools/net80211/wlanwatch/wlanwatch.c,v 1.2 2006/06/30 19:06:18 sam Exp $
*/
/*
@@ -53,7 +53,13 @@
#include <netinet/in.h>
#include <netinet/if_ether.h>
#include <netatalk/at.h>
+#ifdef __NetBSD__
+#include <net80211/ieee80211_netbsd.h>
+#elif __FreeBSD__
#include <net80211/ieee80211_freebsd.h>
+#else
+#error "No support for your operating system!"
+#endif
#include <arpa/inet.h>
#include <netdb.h>
@@ -235,6 +241,19 @@
return (line);
}
+#ifndef SA_SIZE
+/*
+ * This macro returns the size of a struct sockaddr when passed
+ * through a routing socket. Basically we round up sa_len to
+ * a multiple of sizeof(long), with a minimum of sizeof(long).
+ * The check for a NULL pointer is just a convenience, probably never used.
+ * The case sa_len == 0 should only apply to empty structures.
+ */
+#define SA_SIZE(sa) \
+ ( (!(sa) || ((struct sockaddr *)(sa))->sa_len == 0) ? \
+ sizeof(long) : \
+ 1 + ( (((struct sockaddr *)(sa))->sa_len - 1) | (sizeof(long) - 1) ) )
+#endif
static void
pmsg_addrs(char *cp, int addrs)
@@ -339,8 +358,9 @@
case RTM_IEEE80211_JOIN:
case RTM_IEEE80211_REJOIN:
printf("%s station %sjoin",
- ifan->ifan_what == RTM_IEEE80211_REJOIN ? "re" : "",
- ether_sprintf(V(ieee80211_join_event)->iev_addr));
+ ether_sprintf(V(ieee80211_join_event)->iev_addr),
+ ifan->ifan_what == RTM_IEEE80211_REJOIN ? "re" : ""
+ );
break;
case RTM_IEEE80211_LEAVE:
printf("%s station leave",
==== //depot/projects/kmacy_sun4v_stable/src/usr.bin/tail/tail.1#3 (text+ko) ====
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)tail.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/tail/tail.1,v 1.13 2006/06/29 22:07:49 flz Exp $
+.\" $FreeBSD: src/usr.bin/tail/tail.1,v 1.14 2006/06/30 08:19:26 ru Exp $
.\"
.Dd June 29, 2006
.Dt TAIL 1
@@ -48,9 +48,7 @@
.Fl f |
.Fl r
.Oc
-.Oo
-.Fl q
-.Oc
+.Op Fl q
.Oo
.Fl b Ar number |
.Fl c Ar number |
==== //depot/projects/kmacy_sun4v_stable/src/usr.bin/tail/tail.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/tail/tail.c,v 1.22 2006/06/29 22:07:49 flz Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/tail/tail.c,v 1.23 2006/06/30 08:19:26 ru Exp $");
#ifndef lint
static const char copyright[] =
@@ -332,6 +332,7 @@
usage(void)
{
(void)fprintf(stderr,
- "usage: tail [-F | -f | -r] [-b # | -c # | -n #] [file ...]\n");
+ "usage: tail [-F | -f | -r] [-q] [-b # | -c # | -n #]"
+ " [file ...]\n");
exit(1);
}
More information about the p4-projects
mailing list