PERFORCE change 129102 for review
John Birrell
jb at FreeBSD.org
Thu Nov 15 13:53:24 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=129102
Change 129102 by jb at jb_freebsd1 on 2007/11/15 21:53:10
IF7
Affected files ...
.. //depot/projects/dtrace7/src/bin/ps/ps.c#2 integrate
.. //depot/projects/dtrace7/src/sys/cam/scsi/scsi_all.h#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/linux/linux_ioctl.c#2 integrate
.. //depot/projects/dtrace7/src/sys/compat/linux/linux_ioctl.h#2 integrate
.. //depot/projects/dtrace7/src/sys/conf/newvers.sh#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/re/if_re.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/sound/pci/t4dwave.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/tty_pty.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctp_indata.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/sctputil.c#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/ata.h#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/locate/locate/updatedb.sh#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/lsvfs/lsvfs.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/sysinstall/dist.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/sysinstall/dist.h#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/sysinstall/menus.c#2 integrate
Differences ...
==== //depot/projects/dtrace7/src/bin/ps/ps.c#2 (text+ko) ====
@@ -47,7 +47,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111.2.1 2007/11/15 15:56:59 jhb Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -74,6 +74,8 @@
#include "ps.h"
+#define _PATH_PTS "/dev/pts/"
+
#define W_SEP " \t" /* "Whitespace" list separators */
#define T_SEP "," /* "Terminate-element" list separators */
@@ -705,9 +707,9 @@
/*-
* The user can specify a device via one of three formats:
- * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console
- * 2) missing "/dev", e.g.: ttyp0 console
- * 3) two-letters, e.g.: p0 co
+ * 1) fully qualified, e.g.: /dev/ttyp0 /dev/console /dev/pts/0
+ * 2) missing "/dev", e.g.: ttyp0 console pts/0
+ * 3) two-letters, e.g.: p0 co 0
* (matching letters that would be seen in the "TT" column)
*/
static int
@@ -715,10 +717,11 @@
{
const char *ttypath;
struct stat sb;
- char pathbuf[PATH_MAX], pathbuf2[PATH_MAX];
+ char pathbuf[PATH_MAX], pathbuf2[PATH_MAX], pathbuf3[PATH_MAX];
ttypath = NULL;
pathbuf2[0] = '\0';
+ pathbuf3[0] = '\0';
switch (*elem) {
case '/':
ttypath = elem;
@@ -735,6 +738,8 @@
ttypath = pathbuf;
if (strncmp(pathbuf, _PATH_TTY, strlen(_PATH_TTY)) == 0)
break;
+ if (strncmp(pathbuf, _PATH_PTS, strlen(_PATH_PTS)) == 0)
+ break;
if (strcmp(pathbuf, _PATH_CONSOLE) == 0)
break;
/* Check to see if /dev/tty${elem} exists */
@@ -745,21 +750,30 @@
ttypath = NULL;
break;
}
+ /* Check to see if /dev/pts/${elem} exists */
+ strlcpy(pathbuf3, _PATH_PTS, sizeof(pathbuf3));
+ strlcat(pathbuf3, elem, sizeof(pathbuf3));
+ if (stat(pathbuf3, &sb) == 0 && S_ISCHR(sb.st_mode)) {
+ /* No need to repeat stat() && S_ISCHR() checks */
+ ttypath = NULL;
+ break;
+ }
break;
}
if (ttypath) {
if (stat(ttypath, &sb) == -1) {
- if (pathbuf2[0] != '\0')
- warn("%s and %s", pathbuf2, ttypath);
+ if (pathbuf3[0] != '\0')
+ warn("%s, %s, and %s", pathbuf3, pathbuf2,
+ ttypath);
else
warn("%s", ttypath);
optfatal = 1;
return (0);
}
if (!S_ISCHR(sb.st_mode)) {
- if (pathbuf2[0] != '\0')
- warnx("%s and %s: Not a terminal", pathbuf2,
- ttypath);
+ if (pathbuf3[0] != '\0')
+ warnx("%s, %s, and %s: Not a terminal",
+ pathbuf3, pathbuf2, ttypath);
else
warnx("%s: Not a terminal", ttypath);
optfatal = 1;
==== //depot/projects/dtrace7/src/sys/cam/scsi/scsi_all.h#2 (text+ko) ====
@@ -14,7 +14,7 @@
*
* Ported to run under 386BSD by Julian Elischer (julian at tfs.com) Sept 1992
*
- * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.28 2006/12/04 23:04:13 mjacob Exp $
+ * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.28.2.1 2007/11/15 16:27:59 scottl Exp $
*/
/*
@@ -170,8 +170,11 @@
#define SMS_PAGE_CODE 0x3F
#define SMS_VENDOR_SPECIFIC_PAGE 0x00
#define SMS_DISCONNECT_RECONNECT_PAGE 0x02
+#define SMS_CACHE_PAGE 0x08
#define SMS_PERIPHERAL_DEVICE_PAGE 0x09
#define SMS_CONTROL_MODE_PAGE 0x0A
+#define SMS_PROTO_SPECIFIC_PAGE 0x19
+#define SMS_INFO_EXCEPTIONS_PAGE 0x1C
#define SMS_ALL_PAGES_PAGE 0x3F
#define SMS_PAGE_CTRL_MASK 0xC0
#define SMS_PAGE_CTRL_CURRENT 0x00
@@ -257,6 +260,8 @@
#define SLS_ERROR_VERIFY_PAGE 0x05
#define SLS_ERROR_NONMEDIUM_PAGE 0x06
#define SLS_ERROR_LASTN_PAGE 0x07
+#define SLS_SELF_TEST_PAGE 0x10
+#define SLS_IE_PAGE 0x2f
#define SLS_PAGE_CTRL_MASK 0xC0
#define SLS_PAGE_CTRL_THRESHOLD 0x00
#define SLS_PAGE_CTRL_CUMULATIVE 0x40
@@ -329,6 +334,55 @@
u_int8_t aen_holdoff_period[2];
};
+struct scsi_cache_page {
+ u_int8_t page_code;
+#define SCHP_PAGE_SAVABLE 0x80 /* Page is savable */
+ u_int8_t page_length;
+ u_int8_t cache_flags;
+#define SCHP_FLAGS_WCE 0x04 /* Write Cache Enable */
+#define SCHP_FLAGS_MF 0x02 /* Multiplication factor */
+#define SCHP_FLAGS_RCD 0x01 /* Read Cache Disable */
+ u_int8_t rw_cache_policy;
+ u_int8_t dis_prefetch[2];
+ u_int8_t min_prefetch[2];
+ u_int8_t max_prefetch[2];
+ u_int8_t max_prefetch_ceil[2];
+};
+
+struct scsi_info_exceptions_page {
+ u_int8_t page_code;
+#define SIEP_PAGE_SAVABLE 0x80 /* Page is savable */
+ u_int8_t page_length;
+ u_int8_t info_flags;
+#define SIEP_FLAGS_PERF 0x80
+#define SIEP_FLAGS_EBF 0x20
+#define SIEP_FLAGS_EWASC 0x10
+#define SIEP_FLAGS_DEXCPT 0x08
+#define SIEP_FLAGS_TEST 0x04
+#define SIEP_FLAGS_EBACKERR 0x02
+#define SIEP_FLAGS_LOGERR 0x01
+ u_int8_t mrie;
+ u_int8_t interval_timer[4];
+ u_int8_t report_count[4];
+};
+
+struct scsi_proto_specific_page {
+ u_int8_t page_code;
+#define SPSP_PAGE_SAVABLE 0x80 /* Page is savable */
+ u_int8_t page_length;
+ u_int8_t protocol;
+#define SPSP_PROTO_FC 0x00
+#define SPSP_PROTO_SPI 0x01
+#define SPSP_PROTO_SSA 0x02
+#define SPSP_PROTO_1394 0x03
+#define SPSP_PROTO_RDMA 0x04
+#define SPSP_PROTO_ISCSI 0x05
+#define SPSP_PROTO_SAS 0x06
+#define SPSP_PROTO_ADT 0x07
+#define SPSP_PROTO_ATA 0x08
+#define SPSP_PROTO_NONE 0x0f
+};
+
struct scsi_reserve
{
u_int8_t opcode;
@@ -468,6 +522,47 @@
u_int8_t control;
};
+struct ata_pass_12 {
+ u_int8_t opcode;
+ u_int8_t protocol;
+#define AP_MULTI 0xe0
+ u_int8_t flags;
+#define AP_T_LEN 0x03
+#define AP_BB 0x04
+#define AP_T_DIR 0x08
+#define AP_CK_COND 0x20
+#define AP_OFFLINE 0x60
+ u_int8_t features;
+ u_int8_t sector_count;
+ u_int8_t lba_low;
+ u_int8_t lba_mid;
+ u_int8_t lba_high;
+ u_int8_t device;
+ u_int8_t command;
+ u_int8_t reserved;
+ u_int8_t control;
+};
+
+struct ata_pass_16 {
+ u_int8_t opcode;
+ u_int8_t protocol;
+#define AP_EXTEND 0x01
+ u_int8_t flags;
+ u_int8_t features_ext;
+ u_int8_t features;
+ u_int8_t sector_count_ext;
+ u_int8_t sector_count;
+ u_int8_t lba_low_ext;
+ u_int8_t lba_low;
+ u_int8_t lba_mid_ext;
+ u_int8_t lba_mid;
+ u_int8_t lba_high_ext;
+ u_int8_t lba_high;
+ u_int8_t device;
+ u_int8_t command;
+ u_int8_t control;
+};
+
#define SC_SCSI_1 0x01
#define SC_SCSI_2 0x03
@@ -494,6 +589,7 @@
#define WRITE_10 0x2a
#define POSITION_TO_ELEMENT 0x2b
#define SYNCHRONIZE_CACHE 0x35
+#define READ_DEFECT_DATA_10 0x37
#define WRITE_BUFFER 0x3b
#define READ_BUFFER 0x3c
#define CHANGE_DEFINITION 0x40
@@ -501,10 +597,12 @@
#define LOG_SENSE 0x4d
#define MODE_SELECT_10 0x55
#define MODE_SENSE_10 0x5A
+#define ATA_PASS_16 0x85
#define READ_16 0x88
#define WRITE_16 0x8a
#define SERVICE_ACTION_IN 0x9e
#define REPORT_LUNS 0xA0
+#define ATA_PASS_12 0xa1
#define MOVE_MEDIUM 0xa5
#define READ_12 0xa8
#define WRITE_12 0xaa
@@ -663,6 +761,17 @@
u_int8_t vendor_specific1[SID_VENDOR_SPECIFIC_1_SIZE];
};
+struct scsi_vpd_supported_page_list
+{
+ u_int8_t device;
+ u_int8_t page_code;
+#define SVPD_SUPPORTED_PAGE_LIST 0x00
+ u_int8_t reserved;
+ u_int8_t length; /* number of VPD entries */
+#define SVPD_SUPPORTED_PAGES_SIZE 251
+ u_int8_t list[SVPD_SUPPORTED_PAGES_SIZE];
+};
+
struct scsi_vpd_unit_serial_number
{
u_int8_t device;
==== //depot/projects/dtrace7/src/sys/compat/linux/linux_ioctl.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.138 2007/04/07 19:40:58 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.138.2.1 2007/11/15 10:38:06 kib Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2323,6 +2323,7 @@
case LINUX_SIOCGIFCONF:
case LINUX_SIOCGPGRP:
case LINUX_SIOCSPGRP:
+ case LINUX_SIOCGIFCOUNT:
/* these ioctls don't take an interface name */
#ifdef DEBUG
printf("%s(): ioctl %d\n", __func__,
@@ -2344,6 +2345,7 @@
case LINUX_SIOCSIFHWADDR:
case LINUX_SIOCDEVPRIVATE:
case LINUX_SIOCDEVPRIVATE+1:
+ case LINUX_SIOCGIFINDEX:
/* copy in the interface name and translate it. */
error = copyin((void *)args->arg, lifname, LINUX_IFNAMSIZ);
if (error != 0)
@@ -2478,6 +2480,15 @@
error = ioctl(td, (struct ioctl_args *)args);
break;
+ case LINUX_SIOCGIFINDEX:
+ args->cmd = SIOCGIFINDEX;
+ error = ioctl(td, (struct ioctl_args *)args);
+ break;
+
+ case LINUX_SIOCGIFCOUNT:
+ error = 0;
+ break;
+
/*
* XXX This is slightly bogus, but these ioctls are currently
* XXX only used by the aironet (if_an) network driver.
==== //depot/projects/dtrace7/src/sys/compat/linux/linux_ioctl.h#2 (text+ko) ====
@@ -25,7 +25,7 @@
* (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/compat/linux/linux_ioctl.h,v 1.26 2007/04/10 21:37:37 scottl Exp $
+ * $FreeBSD: src/sys/compat/linux/linux_ioctl.h,v 1.26.2.1 2007/11/15 10:38:06 kib Exp $
*/
#ifndef _LINUX_IOCTL_H_
@@ -230,9 +230,12 @@
#define LINUX_SIOCGIFHWADDR 0x8927
#define LINUX_SIOCADDMULTI 0x8931
#define LINUX_SIOCDELMULTI 0x8932
+#define LINUX_SIOCGIFINDEX 0x8933
+#define LINUX_SIOGIFINDEX LINUX_SIOCGIFINDEX
+#define LINUX_SIOCGIFCOUNT 0x8938
#define LINUX_IOCTL_SOCKET_MIN LINUX_FIOSETOWN
-#define LINUX_IOCTL_SOCKET_MAX LINUX_SIOCDELMULTI
+#define LINUX_IOCTL_SOCKET_MAX LINUX_SIOCGIFCOUNT
/*
* Device private ioctl calls
==== //depot/projects/dtrace7/src/sys/conf/newvers.sh#2 (text+ko) ====
@@ -28,11 +28,11 @@
# SUCH DAMAGE.
#
# @(#)newvers.sh 8.1 (Berkeley) 4/20/94
-# $FreeBSD: src/sys/conf/newvers.sh,v 1.72.2.3 2007/11/02 00:59:38 kensmith Exp $
+# $FreeBSD: src/sys/conf/newvers.sh,v 1.72.2.4 2007/11/15 17:10:18 kensmith Exp $
TYPE="FreeBSD"
REVISION="7.0"
-BRANCH="BETA2"
+BRANCH="BETA3"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
==== //depot/projects/dtrace7/src/sys/dev/re/if_re.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.95 2007/08/14 02:00:04 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.95.2.1 2007/11/15 17:45:46 remko Exp $");
/*
* RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver
@@ -172,6 +172,8 @@
static struct rl_type re_devs[] = {
{ DLINK_VENDORID, DLINK_DEVICEID_528T, RL_HWREV_8169S,
"D-Link DGE-528(T) Gigabit Ethernet Adapter" },
+ { DLINK_VENDORID, DLINK_DEVICEID_528T, RL_HWREV_8169_8110SB,
+ "D-Link DGE-528(T) Rev.B1 Gigabit Ethernet Adapter" },
{ RT_VENDORID, RT_DEVICEID_8139, RL_HWREV_8139CPLUS,
"RealTek 8139C+ 10/100BaseTX" },
{ RT_VENDORID, RT_DEVICEID_8101E, RL_HWREV_8101E,
==== //depot/projects/dtrace7/src/sys/dev/sound/pci/t4dwave.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/t4dwave.c,v 1.53 2007/06/17 06:10:42 ariff Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/t4dwave.c,v 1.53.2.1 2007/11/15 16:59:29 ariff Exp $");
/* -------------------------------------------------------------------- */
@@ -811,7 +811,7 @@
u_int32_t data;
struct tr_info *tr;
struct ac97_info *codec = 0;
- int i;
+ int i, dacn;
char status[SND_STATUSLEN];
tr = malloc(sizeof(*tr), M_DEVBUF, M_WAITOK | M_ZERO);
@@ -819,6 +819,25 @@
tr->rev = pci_get_revid(dev);
tr->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_t4dwave softc");
+ if (resource_int_value(device_get_name(dev), device_get_unit(dev),
+ "dac", &i) == 0) {
+ if (i < 1)
+ dacn = 1;
+ else if (i > TR_MAXPLAYCH)
+ dacn = TR_MAXPLAYCH;
+ else
+ dacn = i;
+ } else {
+ switch (tr->type) {
+ case ALI_PCI_ID:
+ dacn = 1;
+ break;
+ default:
+ dacn = TR_MAXPLAYCH;
+ break;
+ }
+ }
+
data = pci_read_config(dev, PCIR_COMMAND, 2);
data |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN);
pci_write_config(dev, PCIR_COMMAND, data, 2);
@@ -871,9 +890,10 @@
snprintf(status, 64, "at io 0x%lx irq %ld %s",
rman_get_start(tr->reg), rman_get_start(tr->irq),PCM_KLDSTRING(snd_t4dwave));
- if (pcm_register(dev, tr, TR_MAXPLAYCH, 1)) goto bad;
+ if (pcm_register(dev, tr, dacn, 1))
+ goto bad;
pcm_addchan(dev, PCMDIR_REC, &trrchan_class, tr);
- for (i = 0; i < TR_MAXPLAYCH; i++)
+ for (i = 0; i < dacn; i++)
pcm_addchan(dev, PCMDIR_PLAY, &trpchan_class, tr);
pcm_setstatus(dev, status);
==== //depot/projects/dtrace7/src/sys/kern/tty_pty.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/tty_pty.c,v 1.152 2007/07/03 17:45:52 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/tty_pty.c,v 1.152.2.1 2007/11/15 20:18:26 jhb Exp $");
/*
* Pseudo-teletype Driver
@@ -40,6 +40,7 @@
#include "opt_tty.h"
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/libkern.h>
#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/sx.h>
@@ -121,15 +122,12 @@
#define TSA_PTC_WRITE(tp) ((void *)&(tp)->t_rawq.c_cl)
#define TSA_PTS_READ(tp) ((void *)&(tp)->t_canq)
-static char *names = "pqrsPQRS";
+static const char names[] = "pqrsPQRS";
/*
* This function creates and initializes a pts/ptc pair
*
* pts == /dev/tty[pqrsPQRS][0123456789abcdefghijklmnopqrstuv]
* ptc == /dev/pty[pqrsPQRS][0123456789abcdefghijklmnopqrstuv]
- *
- * XXX: define and add mapping of upper minor bits to allow more
- * than 256 ptys.
*/
static struct cdev *
ptyinit(struct cdev *devc, struct thread *td)
@@ -137,9 +135,10 @@
struct ptsc *pt;
int n;
- n = minor(devc);
- /* For now we only map the lower 8 bits of the minor */
- if (n & ~0xff)
+ n = minor2unit(minor(devc));
+
+ /* We only allow for up to 32 ptys per char in "names". */
+ if (n >= 32 * (sizeof(names) - 1))
return (NULL);
devc->si_flags &= ~SI_CHEAPCLONE;
@@ -760,32 +759,26 @@
pty_clone(void *arg, struct ucred *cr, char *name, int namelen,
struct cdev **dev)
{
+ char *cp;
int u;
if (*dev != NULL)
return;
if (bcmp(name, "pty", 3) != 0)
return;
- if (name[5] != '\0')
+ if (name[5] != '\0' || name[3] == '\0')
+ return;
+ cp = index(names, name[3]);
+ if (cp == NULL)
return;
- switch (name[3]) {
- case 'p': u = 0; break;
- case 'q': u = 32; break;
- case 'r': u = 64; break;
- case 's': u = 96; break;
- case 'P': u = 128; break;
- case 'Q': u = 160; break;
- case 'R': u = 192; break;
- case 'S': u = 224; break;
- default: return;
- }
+ u = (cp - names) * 32;
if (name[4] >= '0' && name[4] <= '9')
u += name[4] - '0';
else if (name[4] >= 'a' && name[4] <= 'v')
u += name[4] - 'a' + 10;
else
return;
- *dev = make_dev_credf(MAKEDEV_REF, &ptc_cdevsw, u, cr,
+ *dev = make_dev_credf(MAKEDEV_REF, &ptc_cdevsw, unit2minor(u), cr,
UID_ROOT, GID_WHEEL, 0666, "pty%c%r", names[u / 32], u % 32);
(*dev)->si_flags |= SI_CHEAPCLONE;
return;
==== //depot/projects/dtrace7/src/sys/netinet/sctp_indata.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
/* $KAME: sctp_indata.c,v 1.36 2005/03/06 16:04:17 itojun Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/sctp_indata.c,v 1.45.2.1 2007/10/25 12:27:05 rrs Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_indata.c,v 1.45.2.2 2007/11/15 15:03:17 rrs Exp $");
#include <netinet/sctp_os.h>
#include <netinet/sctp_var.h>
@@ -170,8 +170,8 @@
*/
result = 1;
}
- if (asoc->my_rwnd &&
- (asoc->my_rwnd < stcb->sctp_ep->sctp_ep.sctp_sws_receiver)) {
+ if (result &&
+ (result < stcb->sctp_ep->sctp_ep.sctp_sws_receiver)) {
/* SWS engaged, tell peer none left */
result = 1;
}
==== //depot/projects/dtrace7/src/sys/netinet/sctputil.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
/* $KAME: sctputil.c,v 1.37 2005/03/07 23:26:09 itojun Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/sctputil.c,v 1.65.2.2 2007/11/06 02:48:03 rrs Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/sctputil.c,v 1.65.2.3 2007/11/15 15:03:17 rrs Exp $");
#include <netinet/sctp_os.h>
#include <netinet/sctp_pcb.h>
@@ -4934,7 +4934,7 @@
int out_flags = 0, in_flags = 0;
int block_allowed = 1;
uint32_t freed_so_far = 0;
- int copied_so_far = 0;
+ uint32_t copied_so_far = 0;
int in_eeor_mode = 0;
int no_rcv_needed = 0;
uint32_t rwnd_req = 0;
@@ -5585,11 +5585,11 @@
if (TAILQ_NEXT(control, next) == NULL) {
/*
* If we don't have a next we need a
- * lock, if there is a next interupt
- * is filling ahead of us and we
- * don't need a lock to remove this
- * guy (which is the head of the
- * queue).
+ * lock, if there is a next
+ * interrupt is filling ahead of us
+ * and we don't need a lock to
+ * remove this guy (which is the
+ * head of the queue).
*/
if (hold_rlock == 0) {
SCTP_INP_READ_LOCK(inp);
==== //depot/projects/dtrace7/src/sys/sys/ata.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* (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/sys/ata.h,v 1.36 2007/08/13 18:46:31 jhb Exp $
+ * $FreeBSD: src/sys/sys/ata.h,v 1.36.2.1 2007/11/15 16:29:33 scottl Exp $
*/
#ifndef _SYS_ATA_H_
@@ -157,6 +157,15 @@
#define ATA_SUPPORT_FLUSHCACHE48 0x2000
/*084/087*/ u_int16_t extension;
+#define ATA_SUPPORT_SMARTTEST 0x0001
+#define ATA_SUPPORT_SMARTLOG 0x0002
+#define ATA_SUPPORT_MEDIASN 0x0004
+#define ATA_SUPPORT_MEDIAPASS 0x0008
+#define ATA_SUPPORT_STREAMING 0x0010
+#define ATA_SUPPORT_GENLOG 0x0020
+#define ATA_SUPPORT_WRITEDMAFUAEXT 0x0040
+#define ATA_SUPPORT_WRITEDMAQFUAEXT 0x0080
+#define ATA_SUPPORT_64BITWWN 0x0100
} __packed support, enabled;
/*088*/ u_int16_t udmamodes; /* UltraDMA modes */
==== //depot/projects/dtrace7/src/usr.bin/locate/locate/updatedb.sh#2 (text+ko) ====
@@ -26,7 +26,7 @@
#
# updatedb - update locate database for local mounted filesystems
#
-# $FreeBSD: src/usr.bin/locate/locate/updatedb.sh,v 1.20 2005/11/12 12:45:08 grog Exp $
+# $FreeBSD: src/usr.bin/locate/locate/updatedb.sh,v 1.20.2.1 2007/11/15 15:14:16 se Exp $
if [ "$(id -u)" = "0" ]; then
echo ">>> WARNING" 1>&2
@@ -52,7 +52,7 @@
: ${FCODES:=/var/db/locate.database} # the database
: ${SEARCHPATHS:="/"} # directories to be put in the database
: ${PRUNEPATHS:="/tmp /usr/tmp /var/tmp /var/db/portsnap"} # unwanted directories
-: ${FILESYSTEMS:="ufs ext2fs"} # allowed filesystems
+: ${FILESYSTEMS:="ufs ext2fs zfs"} # allowed filesystems
: ${find:=find}
case X"$SEARCHPATHS" in
==== //depot/projects/dtrace7/src/usr.bin/lsvfs/lsvfs.c#2 (text+ko) ====
@@ -6,7 +6,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/lsvfs/lsvfs.c,v 1.18 2007/04/05 21:03:05 pjd Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/lsvfs/lsvfs.c,v 1.18.2.1 2007/11/15 15:18:44 se Exp $");
#include <sys/param.h>
#include <sys/mount.h>
@@ -70,7 +70,7 @@
* NB: if you add new flags, don't forget to add them here vvvvvv too.
*/
static char buf[sizeof
- "static, network, read-only, synthetic, loopback, unicode"];
+ "static, network, read-only, synthetic, loopback, unicode, jail"];
int comma = 0;
buf[0] = '\0';
==== //depot/projects/dtrace7/src/usr.sbin/sysinstall/dist.c#2 (text+ko) ====
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $FreeBSD: src/usr.sbin/sysinstall/dist.c,v 1.249.2.2 2007/11/09 16:16:59 ru Exp $
+ * $FreeBSD: src/usr.sbin/sysinstall/dist.c,v 1.249.2.3 2007/11/15 15:46:35 kensmith Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -141,7 +141,6 @@
DTE_PACKAGE("Xsrv", &XOrgDists, XORG_SERVER, "xorg-server"),
DTE_PACKAGE("Xnest", &XOrgDists, XORG_NESTSERVER, "xorg-nestserver"),
- DTE_PACKAGE("Xprt", &XOrgDists, XORG_PRINTSERVER, "xorg-printserver"),
DTE_PACKAGE("Xvfb", &XOrgDists, XORG_VFBSERVER, "xorg-vfbserver"),
DTE_PACKAGE("Xfmsc", &XOrgDists, XORG_FONTS_MISC, "xorg-fonts-miscbitmaps"),
==== //depot/projects/dtrace7/src/usr.sbin/sysinstall/dist.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/usr.sbin/sysinstall/dist.h,v 1.67.2.2 2007/11/09 16:16:59 ru Exp $ */
+/* $FreeBSD: src/usr.sbin/sysinstall/dist.h,v 1.67.2.3 2007/11/15 15:46:35 kensmith Exp $ */
#ifndef _DIST_H_INCLUDE
#define _DIST_H_INCLUDE
@@ -55,7 +55,6 @@
#define DIST_XORG_SERVER 0x000100
#define DIST_XORG_NESTSERVER 0x000200
-#define DIST_XORG_PRINTSERVER 0x000400
#define DIST_XORG_VFBSERVER 0x000800
#define DIST_XORG_FONTS_MISC 0x010000
==== //depot/projects/dtrace7/src/usr.sbin/sysinstall/menus.c#2 (text+ko) ====
@@ -34,7 +34,7 @@
#ifndef lint
static const char rcsid[] =
- "$FreeBSD: src/usr.sbin/sysinstall/menus.c,v 1.425.2.2 2007/11/09 16:16:59 ru Exp $";
+ "$FreeBSD: src/usr.sbin/sysinstall/menus.c,v 1.425.2.3 2007/11/15 15:46:35 kensmith Exp $";
#endif
#include "sysinstall.h"
@@ -1247,8 +1247,6 @@
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_SERVER },
{ " nest", "Nested X Server",
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_NESTSERVER },
- { " prt", "X Print Server",
- dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_PRINTSERVER },
{ " vfb", "Virtual Framebuffer",
dmenuFlagCheck, dmenuSetFlag, NULL, &XOrgDists, '[', 'X', ']', DIST_XORG_VFBSERVER },
{ NULL } },
More information about the p4-projects
mailing list