svn commit: r241082 - in head/sys: dev/usb dev/usb/controller mips/cavium/usb
Author: hselasky
Date: Mon Oct 1 05:42:43 2012
New Revision: 241082
URL: http://svn.freebsd.org/changeset/base/241082
Log:
Inherit USB mode from RootHUB port where the USB device is connected.
Only RootHUB ports can be dual mode. Disallow OTG ports on external HUBs.
This simplifies some checks in the USB controller drivers.
MFC after:1 week
Modified:
head/sys/dev/usb/controller/at91dci.c
head/sys/dev/usb/controller/atmegadci.c
head/sys/dev/usb/controller/avr32dci.c
head/sys/dev/usb/controller/ehci.c
head/sys/dev/usb/controller/musb_otg.c
head/sys/dev/usb/controller/ohci.c
head/sys/dev/usb/controller/uhci.c
head/sys/dev/usb/controller/uss820dci.c
head/sys/dev/usb/controller/xhci.c
head/sys/dev/usb/usb_hub.c
head/sys/mips/cavium/usb/octusb.c
Modified: head/sys/dev/usb/controller/at91dci.c
==
--- head/sys/dev/usb/controller/at91dci.c Mon Oct 1 05:15:13 2012
(r241081)
+++ head/sys/dev/usb/controller/at91dci.c Mon Oct 1 05:42:43 2012
(r241082)
@@ -2277,10 +2277,6 @@ at91dci_ep_init(struct usb_device *udev,
if (udev-device_index != sc-sc_rt_addr) {
- if (udev-flags.usb_mode != USB_MODE_DEVICE) {
- /* not supported */
- return;
- }
if (udev-speed != USB_SPEED_FULL) {
/* not supported */
return;
Modified: head/sys/dev/usb/controller/atmegadci.c
==
--- head/sys/dev/usb/controller/atmegadci.c Mon Oct 1 05:15:13 2012
(r241081)
+++ head/sys/dev/usb/controller/atmegadci.c Mon Oct 1 05:42:43 2012
(r241082)
@@ -2112,10 +2112,6 @@ atmegadci_ep_init(struct usb_device *ude
if (udev-device_index != sc-sc_rt_addr) {
- if (udev-flags.usb_mode != USB_MODE_DEVICE) {
- /* not supported */
- return;
- }
if (udev-speed != USB_SPEED_FULL) {
/* not supported */
return;
Modified: head/sys/dev/usb/controller/avr32dci.c
==
--- head/sys/dev/usb/controller/avr32dci.c Mon Oct 1 05:15:13 2012
(r241081)
+++ head/sys/dev/usb/controller/avr32dci.c Mon Oct 1 05:42:43 2012
(r241082)
@@ -2056,10 +2056,6 @@ avr32dci_ep_init(struct usb_device *udev
if (udev-device_index != sc-sc_rt_addr) {
- if (udev-flags.usb_mode != USB_MODE_DEVICE) {
- /* not supported */
- return;
- }
if ((udev-speed != USB_SPEED_FULL)
(udev-speed != USB_SPEED_HIGH)) {
/* not supported */
Modified: head/sys/dev/usb/controller/ehci.c
==
--- head/sys/dev/usb/controller/ehci.c Mon Oct 1 05:15:13 2012
(r241081)
+++ head/sys/dev/usb/controller/ehci.c Mon Oct 1 05:42:43 2012
(r241082)
@@ -3701,10 +3701,6 @@ ehci_ep_init(struct usb_device *udev, st
edesc-bEndpointAddress, udev-flags.usb_mode,
sc-sc_addr);
- if (udev-flags.usb_mode != USB_MODE_HOST) {
- /* not supported */
- return;
- }
if (udev-device_index != sc-sc_addr) {
if ((udev-speed != USB_SPEED_HIGH)
Modified: head/sys/dev/usb/controller/musb_otg.c
==
--- head/sys/dev/usb/controller/musb_otg.c Mon Oct 1 05:15:13 2012
(r241081)
+++ head/sys/dev/usb/controller/musb_otg.c Mon Oct 1 05:42:43 2012
(r241082)
@@ -2748,10 +2748,6 @@ musbotg_ep_init(struct usb_device *udev,
if (udev-device_index != sc-sc_rt_addr) {
- if (udev-flags.usb_mode != USB_MODE_DEVICE) {
- /* not supported */
- return;
- }
if ((udev-speed != USB_SPEED_FULL)
(udev-speed != USB_SPEED_HIGH)) {
/* not supported */
Modified: head/sys/dev/usb/controller/ohci.c
==
--- head/sys/dev/usb/controller/ohci.c Mon Oct 1 05:15:13 2012
(r241081)
+++ head/sys/dev/usb/controller/ohci.c Mon Oct 1 05:42:43 2012
(r241082)
@@ -2315,6 +2315,7 @@ ohci_roothub_exec(struct usb_device *ude
}
v = OREAD4(sc, OHCI_RH_PORT_STATUS(index));
DPRINTFN(9, port status=0x%04x\n, v);
+ v = ~UPS_PORT_MODE_DEVICE; /* force host mode */
USETW(sc-sc_hub_desc.ps.wPortStatus, v);
svn commit: r241083 - in head/sys: kern sys
Author: pjd Date: Mon Oct 1 05:43:24 2012 New Revision: 241083 URL: http://svn.freebsd.org/changeset/base/241083 Log: - Enforce CAP_MKFIFO on mkfifoat(2), not on mknodat(2). Without this change mkfifoat(2) was not restricted. - Introduce CAP_MKNOD and enforce it on mknodat(2). Sponsored by: FreeBSD Foundation MFC after:2 weeks Modified: head/sys/kern/vfs_syscalls.c head/sys/sys/capability.h Modified: head/sys/kern/vfs_syscalls.c == --- head/sys/kern/vfs_syscalls.cMon Oct 1 05:42:43 2012 (r241082) +++ head/sys/kern/vfs_syscalls.cMon Oct 1 05:43:24 2012 (r241083) @@ -1334,7 +1334,7 @@ restart: bwillwrite(); NDINIT_ATRIGHTS(nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, fd, - CAP_MKFIFO, td); + CAP_MKNOD, td); if ((error = namei(nd)) != 0) return (error); vfslocked = NDHASGIANT(nd); @@ -1458,8 +1458,9 @@ kern_mkfifoat(struct thread *td, int fd, AUDIT_ARG_MODE(mode); restart: bwillwrite(); - NDINIT_AT(nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, - pathseg, path, fd, td); + NDINIT_ATRIGHTS(nd, CREATE, + LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, fd, + CAP_MKFIFO, td); if ((error = namei(nd)) != 0) return (error); vfslocked = NDHASGIANT(nd); Modified: head/sys/sys/capability.h == --- head/sys/sys/capability.h Mon Oct 1 05:42:43 2012(r241082) +++ head/sys/sys/capability.h Mon Oct 1 05:43:24 2012(r241083) @@ -81,6 +81,7 @@ #defineCAP_MKDIR 0x0020ULL #defineCAP_RMDIR 0x0040ULL #defineCAP_MKFIFO 0x0080ULL +#defineCAP_MKNOD 0x0080ULL /* Lookups - used to constrain *at() calls. */ #defineCAP_LOOKUP 0x0100ULL @@ -137,7 +138,7 @@ #defineCAP_PDKILL 0x0040ULL /* The mask of all valid method rights. */ -#defineCAP_MASK_VALID 0x007fULL +#defineCAP_MASK_VALID 0x00ffULL #ifdef _KERNEL ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241081 - head/sys/arm/ti/usb
Author: andrew
Date: Mon Oct 1 05:15:13 2012
New Revision: 241081
URL: http://svn.freebsd.org/changeset/base/241081
Log:
Remove unused variables from the OMAP ehci code.
Modified:
head/sys/arm/ti/usb/omap_ehci.c
Modified: head/sys/arm/ti/usb/omap_ehci.c
==
--- head/sys/arm/ti/usb/omap_ehci.c Mon Oct 1 05:12:17 2012
(r241080)
+++ head/sys/arm/ti/usb/omap_ehci.c Mon Oct 1 05:15:13 2012
(r241081)
@@ -665,10 +665,8 @@ omap_ehci_fini(struct omap_ehci_softc *i
static int
omap_ehci_suspend(device_t dev)
{
- ehci_softc_t *sc = device_get_softc(dev);
int err;
- sc = sc;
err = bus_generic_suspend(dev);
if (err)
return (err);
@@ -691,8 +689,6 @@ omap_ehci_suspend(device_t dev)
static int
omap_ehci_resume(device_t dev)
{
- ehci_softc_t *sc = device_get_softc(dev);
- sc = sc;
bus_generic_resume(dev);
@@ -715,10 +711,8 @@ omap_ehci_resume(device_t dev)
static int
omap_ehci_shutdown(device_t dev)
{
- ehci_softc_t *sc = device_get_softc(dev);
int err;
- sc = sc;
err = bus_generic_shutdown(dev);
if (err)
return (err);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241084 - in stable/9: etc usr.sbin/moused
Author: hselasky
Date: Mon Oct 1 05:48:46 2012
New Revision: 241084
URL: http://svn.freebsd.org/changeset/base/241084
Log:
MFC r240891:
Improve moused when used with USB mouse devices.
Modified:
stable/9/etc/devd.conf
stable/9/usr.sbin/moused/moused.c
Directory Properties:
stable/9/etc/ (props changed)
stable/9/usr.sbin/ (props changed)
stable/9/usr.sbin/moused/ (props changed)
Modified: stable/9/etc/devd.conf
==
--- stable/9/etc/devd.conf Mon Oct 1 05:43:24 2012(r241083)
+++ stable/9/etc/devd.conf Mon Oct 1 05:48:46 2012(r241084)
@@ -114,14 +114,22 @@ detach 100 {
action /etc/rc.d/syscons setkeyboard /dev/kbd0;
};
-attach 100 {
- device-name ums[0-9]+;
- action /etc/rc.d/moused quietstart $device-name;
+notify 100 {
+ match system DEVFS;
+ match subsystem CDEV;
+ match type CREATE;
+ match cdev ums[0-9]+;
+
+ action /etc/rc.d/moused quietstart $cdev;
};
-detach 100 {
-device-name ums[0-9]+;
-action /etc/rc.d/moused stop $device-name;
+notify 100 {
+ match system DEVFS;
+ match subsystem CDEV;
+ match type DESTROY;
+ match cdev ums[0-9]+;
+
+ action /etc/rc.d/moused stop $cdev;
};
# Firmware download into the ActiveWire board. After the firmware download is
Modified: stable/9/usr.sbin/moused/moused.c
==
--- stable/9/usr.sbin/moused/moused.c Mon Oct 1 05:43:24 2012
(r241083)
+++ stable/9/usr.sbin/moused/moused.c Mon Oct 1 05:48:46 2012
(r241084)
@@ -408,6 +408,7 @@ static struct rodentparam {
int cfd; /* /dev/consolectl file descriptor */
int mremsfd; /* mouse remote server file descriptor */
int mremcfd; /* mouse remote client file descriptor */
+int is_removable; /* set if device is removable, like USB */
long clickthreshold; /* double click speed in msec */
long button2timeout; /* 3 button emulation timeout */
mousehw_t hw; /* mouse device hardware information */
@@ -434,6 +435,7 @@ static struct rodentparam {
.cfd = -1,
.mremsfd = -1,
.mremcfd = -1,
+.is_removable = 0,
.clickthreshold = DFLT_CLICKTHRESHOLD,
.button2timeout = DFLT_BUTTON2TIMEOUT,
.accelx = 1.0,
@@ -570,7 +572,6 @@ main(int argc, char *argv[])
int c;
inti;
intj;
-static int retry;
for (i = 0; i MOUSE_MAXBUTTON; ++i)
mstate[i] = bstate[i];
@@ -876,10 +877,8 @@ main(int argc, char *argv[])
usage();
}
-retry = 1;
-if (strncmp(rodent.portname, /dev/ums, 8) == 0) {
- retry = 5;
-}
+if (strncmp(rodent.portname, /dev/ums, 8) == 0)
+ rodent.is_removable = 1;
for (;;) {
if (setjmp(env) == 0) {
@@ -888,13 +887,8 @@ main(int argc, char *argv[])
signal(SIGQUIT, cleanup);
signal(SIGTERM, cleanup);
signal(SIGUSR1, pause_mouse);
- for (i = 0; i retry; ++i) {
- if (i 0)
- sleep(2);
- rodent.mfd = open(rodent.portname, O_RDWR | O_NONBLOCK);
- if (rodent.mfd != -1 || errno != ENOENT)
- break;
- }
+
+ rodent.mfd = open(rodent.portname, O_RDWR | O_NONBLOCK);
if (rodent.mfd == -1)
logerr(1, unable to open %s, rodent.portname);
if (r_identify() == MOUSE_PROTO_UNKNOWN) {
@@ -944,6 +938,8 @@ main(int argc, char *argv[])
if (rodent.cfd != -1)
close(rodent.cfd);
rodent.mfd = rodent.cfd = -1;
+ if (rodent.is_removable)
+ exit(0);
}
/* NOT REACHED */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241085 - in stable/8: etc usr.sbin/moused
Author: hselasky
Date: Mon Oct 1 05:57:48 2012
New Revision: 241085
URL: http://svn.freebsd.org/changeset/base/241085
Log:
MFC r233090 and r240891:
The UMS module is now loaded by rules in /etc/devd/usb.conf.
Improve moused when used with USB mouse devices.
Modified:
stable/8/etc/devd.conf
stable/8/usr.sbin/moused/moused.c
Directory Properties:
stable/8/etc/ (props changed)
stable/8/usr.sbin/ (props changed)
stable/8/usr.sbin/moused/ (props changed)
Modified: stable/8/etc/devd.conf
==
--- stable/8/etc/devd.conf Mon Oct 1 05:48:46 2012(r241084)
+++ stable/8/etc/devd.conf Mon Oct 1 05:57:48 2012(r241085)
@@ -114,14 +114,22 @@ detach 100 {
action /etc/rc.d/syscons setkeyboard /dev/kbd0;
};
-attach 100 {
- device-name ums[0-9]+;
- action /etc/rc.d/moused quietstart $device-name;
+notify 100 {
+ match system DEVFS;
+ match subsystem CDEV;
+ match type CREATE;
+ match cdev ums[0-9]+;
+
+ action /etc/rc.d/moused quietstart $cdev;
};
-detach 100 {
-device-name ums[0-9]+;
-action /etc/rc.d/moused stop $device-name;
+notify 100 {
+ match system DEVFS;
+ match subsystem CDEV;
+ match type DESTROY;
+ match cdev ums[0-9]+;
+
+ action /etc/rc.d/moused stop $cdev;
};
# Firmware download into the ActiveWire board. After the firmware download is
Modified: stable/8/usr.sbin/moused/moused.c
==
--- stable/8/usr.sbin/moused/moused.c Mon Oct 1 05:48:46 2012
(r241084)
+++ stable/8/usr.sbin/moused/moused.c Mon Oct 1 05:57:48 2012
(r241085)
@@ -408,6 +408,7 @@ static struct rodentparam {
int cfd; /* /dev/consolectl file descriptor */
int mremsfd; /* mouse remote server file descriptor */
int mremcfd; /* mouse remote client file descriptor */
+int is_removable; /* set if device is removable, like USB */
long clickthreshold; /* double click speed in msec */
long button2timeout; /* 3 button emulation timeout */
mousehw_t hw; /* mouse device hardware information */
@@ -434,6 +435,7 @@ static struct rodentparam {
.cfd = -1,
.mremsfd = -1,
.mremcfd = -1,
+.is_removable = 0,
.clickthreshold = DFLT_CLICKTHRESHOLD,
.button2timeout = DFLT_BUTTON2TIMEOUT,
.accelx = 1.0,
@@ -564,15 +566,12 @@ static void mremote_clientchg(int add);
static int kidspad(u_char rxc, mousestatus_t *act);
static int gtco_digipad(u_char, mousestatus_t *);
-static int usbmodule(void);
-
int
main(int argc, char *argv[])
{
int c;
inti;
intj;
-static int retry;
for (i = 0; i MOUSE_MAXBUTTON; ++i)
mstate[i] = bstate[i];
@@ -878,11 +877,8 @@ main(int argc, char *argv[])
usage();
}
-retry = 1;
-if (strncmp(rodent.portname, /dev/ums, 8) == 0) {
- if (usbmodule() != 0)
- retry = 5;
-}
+if (strncmp(rodent.portname, /dev/ums, 8) == 0)
+ rodent.is_removable = 1;
for (;;) {
if (setjmp(env) == 0) {
@@ -891,13 +887,8 @@ main(int argc, char *argv[])
signal(SIGQUIT, cleanup);
signal(SIGTERM, cleanup);
signal(SIGUSR1, pause_mouse);
- for (i = 0; i retry; ++i) {
- if (i 0)
- sleep(2);
- rodent.mfd = open(rodent.portname, O_RDWR | O_NONBLOCK);
- if (rodent.mfd != -1 || errno != ENOENT)
- break;
- }
+
+ rodent.mfd = open(rodent.portname, O_RDWR | O_NONBLOCK);
if (rodent.mfd == -1)
logerr(1, unable to open %s, rodent.portname);
if (r_identify() == MOUSE_PROTO_UNKNOWN) {
@@ -947,18 +938,14 @@ main(int argc, char *argv[])
if (rodent.cfd != -1)
close(rodent.cfd);
rodent.mfd = rodent.cfd = -1;
+ if (rodent.is_removable)
+ exit(0);
}
/* NOT REACHED */
exit(0);
}
-static int
-usbmodule(void)
-{
-return (kld_isloaded(uhub/ums) || kld_load(ums) != -1);
-}
-
/*
* Function to calculate linear acceleration.
*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241086 - stable/8/sys/dev/usb/serial
Author: hselasky
Date: Mon Oct 1 06:00:08 2012
New Revision: 241086
URL: http://svn.freebsd.org/changeset/base/241086
Log:
MFC r240856:
Correct driver name.
Modified:
stable/8/sys/dev/usb/serial/uchcom.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/usb/ (props changed)
Modified: stable/8/sys/dev/usb/serial/uchcom.c
==
--- stable/8/sys/dev/usb/serial/uchcom.cMon Oct 1 05:57:48 2012
(r241085)
+++ stable/8/sys/dev/usb/serial/uchcom.cMon Oct 1 06:00:08 2012
(r241086)
@@ -847,7 +847,7 @@ static device_method_t uchcom_methods[]
};
static driver_t uchcom_driver = {
- .name = ucom,
+ .name = uchcom,
.methods = uchcom_methods,
.size = sizeof(struct uchcom_softc)
};
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241087 - stable/9/sys/dev/usb/serial
Author: hselasky
Date: Mon Oct 1 06:01:20 2012
New Revision: 241087
URL: http://svn.freebsd.org/changeset/base/241087
Log:
MFC r240856:
Correct driver name.
Modified:
stable/9/sys/dev/usb/serial/uchcom.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/usb/serial/uchcom.c
==
--- stable/9/sys/dev/usb/serial/uchcom.cMon Oct 1 06:00:08 2012
(r241086)
+++ stable/9/sys/dev/usb/serial/uchcom.cMon Oct 1 06:01:20 2012
(r241087)
@@ -870,7 +870,7 @@ static device_method_t uchcom_methods[]
};
static driver_t uchcom_driver = {
- .name = ucom,
+ .name = uchcom,
.methods = uchcom_methods,
.size = sizeof(struct uchcom_softc)
};
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241088 - in stable/9/sys: cddl/contrib/opensolaris/uts/common/dtrace dev/drm dev/drm2 dev/ksyms fs/devfs ofed/include/linux
Author: hselasky
Date: Mon Oct 1 06:42:07 2012
New Revision: 241088
URL: http://svn.freebsd.org/changeset/base/241088
Log:
MFC r239303:
Streamline use of cdevpriv and correct some corner cases.
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
stable/9/sys/dev/drm/drm_fops.c
stable/9/sys/dev/drm2/drm_fops.c
stable/9/sys/dev/ksyms/ksyms.c
stable/9/sys/fs/devfs/devfs_vnops.c
stable/9/sys/ofed/include/linux/linux_compat.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/fs/ (props changed)
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
==
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.cMon Oct
1 06:01:20 2012(r241087)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.cMon Oct
1 06:42:07 2012(r241088)
@@ -15517,8 +15517,6 @@ dtrace_close(struct cdev *dev, int flags
kmem_free(state, 0);
#if __FreeBSD_version 800039
dev-si_drv1 = NULL;
-#else
- devfs_clear_cdevpriv();
#endif
#endif
}
Modified: stable/9/sys/dev/drm/drm_fops.c
==
--- stable/9/sys/dev/drm/drm_fops.c Mon Oct 1 06:01:20 2012
(r241087)
+++ stable/9/sys/dev/drm/drm_fops.c Mon Oct 1 06:42:07 2012
(r241088)
@@ -57,12 +57,6 @@ int drm_open_helper(struct cdev *kdev, i
return ENOMEM;
}
- retcode = devfs_set_cdevpriv(priv, drm_close);
- if (retcode != 0) {
- free(priv, DRM_MEM_FILES);
- return retcode;
- }
-
DRM_LOCK();
priv-dev = dev;
priv-uid = p-td_ucred-cr_svuid;
@@ -76,7 +70,6 @@ int drm_open_helper(struct cdev *kdev, i
/* shared code returns -errno */
retcode = -dev-driver-open(dev, priv);
if (retcode != 0) {
- devfs_clear_cdevpriv();
free(priv, DRM_MEM_FILES);
DRM_UNLOCK();
return retcode;
@@ -89,7 +82,12 @@ int drm_open_helper(struct cdev *kdev, i
TAILQ_INSERT_TAIL(dev-files, priv, link);
DRM_UNLOCK();
kdev-si_drv1 = dev;
- return 0;
+
+ retcode = devfs_set_cdevpriv(priv, drm_close);
+ if (retcode != 0)
+ drm_close(priv);
+
+ return (retcode);
}
Modified: stable/9/sys/dev/drm2/drm_fops.c
==
--- stable/9/sys/dev/drm2/drm_fops.cMon Oct 1 06:01:20 2012
(r241087)
+++ stable/9/sys/dev/drm2/drm_fops.cMon Oct 1 06:42:07 2012
(r241088)
@@ -57,12 +57,6 @@ int drm_open_helper(struct cdev *kdev, i
return ENOMEM;
}
- retcode = devfs_set_cdevpriv(priv, drm_close);
- if (retcode != 0) {
- free(priv, DRM_MEM_FILES);
- return retcode;
- }
-
DRM_LOCK(dev);
priv-dev = dev;
priv-uid = p-td_ucred-cr_svuid;
@@ -83,7 +77,6 @@ int drm_open_helper(struct cdev *kdev, i
/* shared code returns -errno */
retcode = -dev-driver-open(dev, priv);
if (retcode != 0) {
- devfs_clear_cdevpriv();
free(priv, DRM_MEM_FILES);
DRM_UNLOCK(dev);
return retcode;
@@ -96,7 +89,12 @@ int drm_open_helper(struct cdev *kdev, i
TAILQ_INSERT_TAIL(dev-files, priv, link);
DRM_UNLOCK(dev);
kdev-si_drv1 = dev;
- return 0;
+
+ retcode = devfs_set_cdevpriv(priv, drm_close);
+ if (retcode != 0)
+ drm_close(priv);
+
+ return (retcode);
}
static bool
Modified: stable/9/sys/dev/ksyms/ksyms.c
==
--- stable/9/sys/dev/ksyms/ksyms.c Mon Oct 1 06:01:20 2012
(r241087)
+++ stable/9/sys/dev/ksyms/ksyms.c Mon Oct 1 06:42:07 2012
(r241088)
@@ -579,8 +579,6 @@ ksyms_close(struct cdev *dev, int flags
/* Unmap the buffer from the process address space. */
error = copyout_unmap(td, sc-sc_uaddr, sc-sc_usize);
- devfs_clear_cdevpriv();
-
return (error);
}
Modified: stable/9/sys/fs/devfs/devfs_vnops.c
==
--- stable/9/sys/fs/devfs/devfs_vnops.c Mon Oct 1 06:01:20 2012
(r241087)
+++ stable/9/sys/fs/devfs/devfs_vnops.c Mon Oct 1 06:42:07 2012
(r241088)
@@ -1081,6 +1081,9 @@ devfs_open(struct vop_open_args *ap)
error = dsw-d_fdopen(dev,
svn commit: r241089 - head/etc/devd
Author: hselasky
Date: Mon Oct 1 06:48:59 2012
New Revision: 241089
URL: http://svn.freebsd.org/changeset/base/241089
Log:
Regenerate usb.conf
MFC after:1 week
Modified:
head/etc/devd/usb.conf
Modified: head/etc/devd/usb.conf
==
--- head/etc/devd/usb.conf Mon Oct 1 06:42:07 2012(r241088)
+++ head/etc/devd/usb.conf Mon Oct 1 06:48:59 2012(r241089)
@@ -157,7 +157,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x0403;
- match product
(0x6001|0x6004|0x6006|0x6010|0x6011|0x6014|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed73|0xed74|0xee18|0xeee8|0xeee9|0xeeea|0xee
eb|0xeee
c|0xeeed|0x|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8);
+ match product
(0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed73|0xed74|0xee18|0xeee8|0xeee9|0xee
ea|0xeee
b|0xeeec|0xeeed|0x|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8);
action kldload -n uftdi;
};
@@ -2061,7 +2061,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x0b05;
- match product (0x1731|0x1732|0x1742|0x1760|0x1761|0x1784|0x1790);
+ match product
(0x1731|0x1732|0x1742|0x1760|0x1761|0x1784|0x1790|0x179d);
action kldload -n if_run;
};
@@ -3861,7 +3861,7 @@ nomatch 32 {
match bus uhub[0-9]+;
match mode host;
match vendor 0x1a86;
- match product 0x7523;
+ match product (0x5523|0x7523);
action kldload -n uchcom;
};
@@ -4600,5 +4600,5 @@ nomatch 32 {
action kldload -n umass;
};
-# 2271 USB entries processed
+# 2274 USB entries processed
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241091 - stable/9/sys/dev/drm2/i915
Author: mav
Date: Mon Oct 1 08:33:39 2012
New Revision: 241091
URL: http://svn.freebsd.org/changeset/base/241091
Log:
MFC r240917:
Reduce delays in several wait loops from 10ms to 10us, same is it is done
in Linux. This substantially increases graphics performance on Ivy Bridge.
Submitted by: avg@
Reviewed by: kib@
Modified:
stable/9/sys/dev/drm2/i915/i915_drv.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/drm2/i915/i915_drv.c
==
--- stable/9/sys/dev/drm2/i915/i915_drv.c Mon Oct 1 08:32:05 2012
(r241090)
+++ stable/9/sys/dev/drm2/i915/i915_drv.c Mon Oct 1 08:33:39 2012
(r241091)
@@ -486,14 +486,14 @@ __gen6_gt_force_wake_get(struct drm_i915
count = 0;
while (count++ 50 (I915_READ_NOTRACE(FORCEWAKE_ACK) 1))
- DELAY(1);
+ DELAY(10);
I915_WRITE_NOTRACE(FORCEWAKE, 1);
POSTING_READ(FORCEWAKE);
count = 0;
while (count++ 50 (I915_READ_NOTRACE(FORCEWAKE_ACK) 1) == 0)
- DELAY(1);
+ DELAY(10);
}
void
@@ -503,14 +503,14 @@ __gen6_gt_force_wake_mt_get(struct drm_i
count = 0;
while (count++ 50 (I915_READ_NOTRACE(FORCEWAKE_MT_ACK) 1))
- DELAY(1);
+ DELAY(10);
I915_WRITE_NOTRACE(FORCEWAKE_MT, (116) | 1);
POSTING_READ(FORCEWAKE_MT);
count = 0;
while (count++ 50 (I915_READ_NOTRACE(FORCEWAKE_MT_ACK) 1) == 0)
- DELAY(1);
+ DELAY(10);
}
void
@@ -572,7 +572,7 @@ __gen6_gt_wait_for_fifo(struct drm_i915_
int loop = 500;
u32 fifo = I915_READ_NOTRACE(GT_FIFO_FREE_ENTRIES);
while (fifo = GT_FIFO_NUM_RESERVED_ENTRIES loop--) {
- DELAY(1);
+ DELAY(10);
fifo = I915_READ_NOTRACE(GT_FIFO_FREE_ENTRIES);
}
if (loop 0 fifo = GT_FIFO_NUM_RESERVED_ENTRIES) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241092 - head
Author: kib Date: Mon Oct 1 10:46:35 2012 New Revision: 241092 URL: http://svn.freebsd.org/changeset/base/241092 Log: Add the UPDATING note about padlock rng support requiring the config change. Requested by: Dewayne Geraghty dewayne.gerag...@heuristicsystems.com.au MFC after:3 days Modified: head/UPDATING Modified: head/UPDATING == --- head/UPDATING Mon Oct 1 08:33:39 2012(r241091) +++ head/UPDATING Mon Oct 1 10:46:35 2012(r241092) @@ -24,6 +24,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run ln -s 'abort:false,junk:false' /etc/malloc.conf.) +20120913: + The random(4) support for the VIA hardware random number + generator (`PADLOCK') is no longer enabled unconditionally. + Add the PADLOCK_RNG option in the custom kernel config if + needed. The GENERIC kernels on i386 and amd64 do include the + option, so the change only affects the custom kernel + configurations. + 20120908: The pf(4) packet filter ABI has been changed. pfctl(8) and snmp_pf module need to be recompiled to work with new kernel. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241093 - releng/9.1/sys/dev/drm2/i915
Author: mav
Date: Mon Oct 1 10:52:10 2012
New Revision: 241093
URL: http://svn.freebsd.org/changeset/base/241093
Log:
MFC r240917:
Reduce delays in several wait loops from 10ms to 10us, same is it is
done in Linux. This substantially increases graphics performance on Ivy
Bridge.
Submitted by: avg@
Reviewed by: kib@
Approved by: re (kib)
Modified:
releng/9.1/sys/dev/drm2/i915/i915_drv.c
Directory Properties:
releng/9.1/sys/ (props changed)
releng/9.1/sys/dev/ (props changed)
Modified: releng/9.1/sys/dev/drm2/i915/i915_drv.c
==
--- releng/9.1/sys/dev/drm2/i915/i915_drv.c Mon Oct 1 10:46:35 2012
(r241092)
+++ releng/9.1/sys/dev/drm2/i915/i915_drv.c Mon Oct 1 10:52:10 2012
(r241093)
@@ -486,14 +486,14 @@ __gen6_gt_force_wake_get(struct drm_i915
count = 0;
while (count++ 50 (I915_READ_NOTRACE(FORCEWAKE_ACK) 1))
- DELAY(1);
+ DELAY(10);
I915_WRITE_NOTRACE(FORCEWAKE, 1);
POSTING_READ(FORCEWAKE);
count = 0;
while (count++ 50 (I915_READ_NOTRACE(FORCEWAKE_ACK) 1) == 0)
- DELAY(1);
+ DELAY(10);
}
void
@@ -503,14 +503,14 @@ __gen6_gt_force_wake_mt_get(struct drm_i
count = 0;
while (count++ 50 (I915_READ_NOTRACE(FORCEWAKE_MT_ACK) 1))
- DELAY(1);
+ DELAY(10);
I915_WRITE_NOTRACE(FORCEWAKE_MT, (116) | 1);
POSTING_READ(FORCEWAKE_MT);
count = 0;
while (count++ 50 (I915_READ_NOTRACE(FORCEWAKE_MT_ACK) 1) == 0)
- DELAY(1);
+ DELAY(10);
}
void
@@ -572,7 +572,7 @@ __gen6_gt_wait_for_fifo(struct drm_i915_
int loop = 500;
u32 fifo = I915_READ_NOTRACE(GT_FIFO_FREE_ENTRIES);
while (fifo = GT_FIFO_NUM_RESERVED_ENTRIES loop--) {
- DELAY(1);
+ DELAY(10);
fifo = I915_READ_NOTRACE(GT_FIFO_FREE_ENTRIES);
}
if (loop 0 fifo = GT_FIFO_NUM_RESERVED_ENTRIES) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241094 - stable/9/sys/ofed/drivers/infiniband/ulp/ipoib
Author: melifaro Date: Mon Oct 1 10:54:04 2012 New Revision: 241094 URL: http://svn.freebsd.org/changeset/base/241094 Log: Merge r240082. Remove unneeded ipfw headers introduced in r213447 from Infiniband code. Modified: stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h == --- stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h Mon Oct 1 10:52:10 2012(r241093) +++ stable/9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h Mon Oct 1 10:54:04 2012(r241094) @@ -67,8 +67,6 @@ #include netinet/in_var.h #include netinet/if_ether.h #include netinet/ip_var.h -#include netinet/ip_fw.h -#include netinet/ipfw/ip_fw_private.h #endif #ifdef INET6 #include netinet6/nd6.h ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241095 - stable/9/usr.bin/rctl
Author: trasz Date: Mon Oct 1 11:16:22 2012 New Revision: 241095 URL: http://svn.freebsd.org/changeset/base/241095 Log: MFC r240575: Remove references to userstat(1) and jailstat(1). Those tools were never merged from the Perforce branch. They might be brought in when %CPU limits go into the tree. PR: docs/171240 Modified: stable/9/usr.bin/rctl/rctl.8 Directory Properties: stable/9/usr.bin/rctl/ (props changed) Modified: stable/9/usr.bin/rctl/rctl.8 == --- stable/9/usr.bin/rctl/rctl.8Mon Oct 1 10:54:04 2012 (r241094) +++ stable/9/usr.bin/rctl/rctl.8Mon Oct 1 11:16:22 2012 (r241095) @@ -25,7 +25,7 @@ .\ .\ $FreeBSD$ .\ -.Dd September 1, 2012 +.Dd September 16, 2012 .Dt RCTL 8 .Os .Sh NAME @@ -184,9 +184,7 @@ Display resource usage information for j .Pp Display all the rules applicable to process with PID 512. .Sh SEE ALSO -.Xr rctl.conf 5 , -.Xr jailstat 8 , -.Xr userstat 8 +.Xr rctl.conf 5 .Sh HISTORY The .Nm ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241097 - head/sys/rpc/rpcsec_gss
Author: rmacklem
Date: Mon Oct 1 12:28:58 2012
New Revision: 241097
URL: http://svn.freebsd.org/changeset/base/241097
Log:
Attila Bogar and Herbert Poeckl both reported similar problems
w.r.t. a Linux NFS client doing a krb5 NFS mount against the
FreeBSD server. We determined this was a Linux bug:
http://www.spinics.net/lists/linux-nfs/msg32466.html, however
the mount failed to work, because the Destroy operation with a
bogus encrypted checksum destroyed the authenticator handle.
This patch changes the rpcsec_gss code so that it doesn't
Destroy the authenticator handle for this case and, as such,
the Linux mount will work.
Tested by: Attila Bogar and Herbert Poeckl
MFC after:2 weeks
Modified:
head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
Modified: head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
==
--- head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.cMon Oct 1 11:26:49 2012
(r241096)
+++ head/sys/rpc/rpcsec_gss/svc_rpcsec_gss.cMon Oct 1 12:28:58 2012
(r241097)
@@ -984,7 +984,7 @@ svc_rpc_gss_accept_sec_context(struct sv
static bool_t
svc_rpc_gss_validate(struct svc_rpc_gss_client *client, struct rpc_msg *msg,
-gss_qop_t *qop)
+gss_qop_t *qop, rpc_gss_proc_t gcproc)
{
struct opaque_auth *oa;
gss_buffer_desc rpcbuf, checksum;
@@ -1024,7 +1024,8 @@ svc_rpc_gss_validate(struct svc_rpc_gss_
if (maj_stat != GSS_S_COMPLETE) {
rpc_gss_log_status(gss_verify_mic, client-cl_mech,
maj_stat, min_stat);
- client-cl_state = CLIENT_STALE;
+ if (gcproc != RPCSEC_GSS_DESTROY)
+ client-cl_state = CLIENT_STALE;
return (FALSE);
}
@@ -1358,7 +1359,7 @@ svc_rpc_gss(struct svc_req *rqst, struct
break;
}
- if (!svc_rpc_gss_validate(client, msg, qop)) {
+ if (!svc_rpc_gss_validate(client, msg, qop, gc.gc_proc)) {
result = RPCSEC_GSS_CREDPROBLEM;
break;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r241053 - in head/sys/boot: common i386/libi386 uboot/lib userboot/userboot
On Saturday, September 29, 2012 12:47:57 pm Andrey V. Elsukov wrote: Author: ae Date: Sat Sep 29 16:47:56 2012 New Revision: 241053 URL: http://svn.freebsd.org/changeset/base/241053 Log: Almost each time when loader opens a file, this leads to calling disk_open(). Very often this is called several times for one file. This leads to reading partition table metadata for each call. To reduce the number of disk I/O we have a simple block cache, but it is very dumb and more than half of I/O operations related to reading metadata, misses this cache. Introduce new cache layer to resolve this problem. It is independent and doesn't need initialization like bcache, and will work by default for all loaders which use the new DISK API. A successful disk_open() call to each new disk or partition produces new entry in the cache. Even more, when disk was already open, now opening of any nested partitions does not require reading top level partition table. So, if without this cache, partition table metadata was read around 20-50 times during boot, now it reads only once. This affects the booting from GPT and MBR from the UFS. ...and removes support for removable media like floppies. That may be the proper thing to do at this stage (though I think that affects PC98 still perhaps?) However, removing suppot for removable media should be an intentional decision, not a side effect. The bcache was simplistic precisely to support floppies. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r241068 - head/sys/boot/i386/loader
On Sunday, September 30, 2012 8:24:16 am Andrey V. Elsukov wrote: Author: ae Date: Sun Sep 30 12:24:15 2012 New Revision: 241068 URL: http://svn.freebsd.org/changeset/base/241068 Log: Reduce the number of attempts to detect proper kld format for the amd64 loader. Why not just put amd64 first always? To date the amd64 and i386 loaders have been identical (rather on purpose). If amd64 is the more common use case and worth optimizing for, I think it would be fine to just put amd64 first all the time (that order also makes the list sorted). -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241098 - stable/8/usr.sbin/lpr/common_source
Author: jh
Date: Mon Oct 1 14:52:34 2012
New Revision: 241098
URL: http://svn.freebsd.org/changeset/base/241098
Log:
MFC r238546: Remove trailing whitespace.
Modified:
stable/8/usr.sbin/lpr/common_source/common.c
Directory Properties:
stable/8/usr.sbin/lpr/ (props changed)
stable/8/usr.sbin/lpr/lpd/ (props changed)
Modified: stable/8/usr.sbin/lpr/common_source/common.c
==
--- stable/8/usr.sbin/lpr/common_source/common.cMon Oct 1 12:28:58
2012(r241097)
+++ stable/8/usr.sbin/lpr/common_source/common.cMon Oct 1 14:52:34
2012(r241098)
@@ -136,7 +136,7 @@ getq(const struct printer *pp, struct jo
/*
* Estimate the array size by taking the size of the directory file
-* and dividing it by a multiple of the minimum size entry.
+* and dividing it by a multiple of the minimum size entry.
*/
arraysz = (stbuf.st_size / 24);
queue = (struct jobqueue **)malloc(arraysz * sizeof(struct jobqueue *));
@@ -641,7 +641,7 @@ trstat_write(struct printer *pp, tr_send
* secs=n - seconds it took to transfer the file
* bytes=n - number of bytes transfered (ie, bytecount)
* bps=n.nen - Bytes/sec (if the transfer was big enough
-* for this to be useful)
+* for this to be useful)
* ! top=str - type of printer (if the type is defined in
* printcap, and if this statline is for sending
* a file to that ptr)
@@ -719,7 +719,7 @@ trstat_write(struct printer *pp, tr_send
if (remspace 1) {
strcpy(eostat, \n);
} else {
- /* probably should back up to just before the final x=.. */
+ /* probably should back up to just before the final x=.. */
strcpy(statline+STATLINE_SIZE-2, \n);
}
statfile = open(statfname, O_WRONLY|O_APPEND, 0664);
@@ -732,7 +732,7 @@ trstat_write(struct printer *pp, tr_send
close(statfile);
return;
-#undef UPD_EOSTAT
+#undef UPD_EOSTAT
}
#include stdarg.h
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241099 - stable/8/usr.sbin/lpr/common_source
Author: jh Date: Mon Oct 1 14:55:22 2012 New Revision: 241099 URL: http://svn.freebsd.org/changeset/base/241099 Log: MFC r238547: Make sure that arraysz is initialized to a value larger than zero. arraysz could get initialized to zero on ZFS because ZFS reports directory sizes differently compared to UFS. PR: bin/169493 Modified: stable/8/usr.sbin/lpr/common_source/common.c Directory Properties: stable/8/usr.sbin/lpr/ (props changed) stable/8/usr.sbin/lpr/lpd/ (props changed) Modified: stable/8/usr.sbin/lpr/common_source/common.c == --- stable/8/usr.sbin/lpr/common_source/common.cMon Oct 1 14:52:34 2012(r241098) +++ stable/8/usr.sbin/lpr/common_source/common.cMon Oct 1 14:55:22 2012(r241099) @@ -139,6 +139,8 @@ getq(const struct printer *pp, struct jo * and dividing it by a multiple of the minimum size entry. */ arraysz = (stbuf.st_size / 24); + if (arraysz 16) + arraysz = 16; queue = (struct jobqueue **)malloc(arraysz * sizeof(struct jobqueue *)); if (queue == NULL) goto errdone; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241100 - head/sys/arm/conf
Author: kientzle Date: Mon Oct 1 14:56:48 2012 New Revision: 241100 URL: http://svn.freebsd.org/changeset/base/241100 Log: Support kernel options from ubldr. Modified: head/sys/arm/conf/BEAGLEBONE Modified: head/sys/arm/conf/BEAGLEBONE == --- head/sys/arm/conf/BEAGLEBONEMon Oct 1 14:55:22 2012 (r241099) +++ head/sys/arm/conf/BEAGLEBONEMon Oct 1 14:56:48 2012 (r241100) @@ -46,6 +46,7 @@ options SYSVSEM #SYSV-style semaphore options_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions optionsKBD_INSTALL_CDEV# install a CDEV entry in /dev optionsPREEMPTION +optionsFREEBSD_BOOT_LOADER # Debugging makeoptionsDEBUG=-g#Build kernel with gdb(1) debug symbols ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r241053 - in head/sys/boot: common i386/libi386 uboot/lib userboot/userboot
On 01.10.2012 15:53, John Baldwin wrote: Introduce new cache layer to resolve this problem. It is independent and doesn't need initialization like bcache, and will work by default for all loaders which use the new DISK API. A successful disk_open() call to each new disk or partition produces new entry in the cache. Even more, when disk was already open, now opening of any nested partitions does not require reading top level partition table. So, if without this cache, partition table metadata was read around 20-50 times during boot, now it reads only once. This affects the booting from GPT and MBR from the UFS. ...and removes support for removable media like floppies. That may be the proper thing to do at this stage (though I think that affects PC98 still perhaps?) However, removing suppot for removable media should be an intentional decision, not a side effect. The bcache was simplistic precisely to support floppies. Hi, John, I think it shouldn't affect floppies support. I'm unable to test this, and I don't remember exactly, but floppies don't have partition tables, or just have simple MBR. So, when access to the floppy will be performed first time, the following cache entry will be created disk0: - some_offset, probably an offset will be zero. And when you change the floppy this offset still remain the same. There is a lot of other places in the libstand, where similar behavior still remain (i mean, one operation initiates several unneeded reads): * Each open() call initiates read file system metadata. * We have the support of different file systems. Some of those are real file systems, other aren't - gzip, bzip, split. During boot loader tries to open several files, which don't exists by default. Each this attempt initiates reading of metadata of each file system several times. Why? When we do first read we can determine that we have UFS on this media, why do we trying search msdos or ext2fs here? Ok, when we fail to open this file on the all of file systems, we are going to try them again with .gz extension... Make a new loader is very hard task, but we can optimize this and don't do these unneeded operations. I have added rdtsc() call at the beginning of the main() and before the kernel start, and I did several tests with today's loader and with old one (before all my changes). So, the results are: UFS+GPT ZFS+GPT ZFS+GPT+several disks new_loader 7,203s 20,584s 26,079s old_loader 4,334s 9,422s 11,245s -- WBR, Andrey V. Elsukov ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r241053 - in head/sys/boot: common i386/libi386 uboot/lib userboot/userboot
On 01.10.2012 19:22, Andrey V. Elsukov wrote: UFS+GPT ZFS+GPT ZFS+GPT+several disks new_loader7,203s 20,584s 26,079s old_loader4,334s 9,422s 11,245s Of course, new_loader and old_loader should switch places :) -- WBR, Andrey V. Elsukov ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241101 - in stable/9: sys/dev/pci usr.sbin/pciconf
Author: gavin
Date: Mon Oct 1 15:47:01 2012
New Revision: 241101
URL: http://svn.freebsd.org/changeset/base/241101
Log:
Merge the following from head:
r240694
Add PCI subclass for NVM Express devices.
r240699, r240739
Recognise NVM devices and pretty-print their name.
Modified:
stable/9/sys/dev/pci/pci.c
stable/9/sys/dev/pci/pcireg.h
stable/9/usr.sbin/pciconf/pciconf.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/usr.sbin/pciconf/ (props changed)
Modified: stable/9/sys/dev/pci/pci.c
==
--- stable/9/sys/dev/pci/pci.c Mon Oct 1 14:56:48 2012(r241100)
+++ stable/9/sys/dev/pci/pci.c Mon Oct 1 15:47:01 2012(r241101)
@@ -3590,6 +3590,7 @@ static struct
{PCIC_STORAGE, PCIS_STORAGE_ATA_ADMA, ATA (ADMA)},
{PCIC_STORAGE, PCIS_STORAGE_SATA, SATA},
{PCIC_STORAGE, PCIS_STORAGE_SAS, SAS},
+ {PCIC_STORAGE, PCIS_STORAGE_NVM, NVM},
{PCIC_NETWORK, -1, network},
{PCIC_NETWORK, PCIS_NETWORK_ETHERNET, ethernet},
{PCIC_NETWORK, PCIS_NETWORK_TOKENRING, token ring},
Modified: stable/9/sys/dev/pci/pcireg.h
==
--- stable/9/sys/dev/pci/pcireg.h Mon Oct 1 14:56:48 2012
(r241100)
+++ stable/9/sys/dev/pci/pcireg.h Mon Oct 1 15:47:01 2012
(r241101)
@@ -263,6 +263,7 @@
#definePCIS_STORAGE_SATA 0x06
#definePCIP_STORAGE_SATA_AHCI_1_0 0x01
#definePCIS_STORAGE_SAS0x07
+#definePCIS_STORAGE_NVM0x08
#definePCIS_STORAGE_OTHER 0x80
#definePCIC_NETWORK0x02
Modified: stable/9/usr.sbin/pciconf/pciconf.c
==
--- stable/9/usr.sbin/pciconf/pciconf.c Mon Oct 1 14:56:48 2012
(r241100)
+++ stable/9/usr.sbin/pciconf/pciconf.c Mon Oct 1 15:47:01 2012
(r241101)
@@ -345,6 +345,7 @@ static struct
{PCIC_STORAGE, PCIS_STORAGE_ATA_ADMA, ATA (ADMA)},
{PCIC_STORAGE, PCIS_STORAGE_SATA, SATA},
{PCIC_STORAGE, PCIS_STORAGE_SAS, SAS},
+ {PCIC_STORAGE, PCIS_STORAGE_NVM, NVM},
{PCIC_NETWORK, -1, network},
{PCIC_NETWORK, PCIS_NETWORK_ETHERNET, ethernet},
{PCIC_NETWORK, PCIS_NETWORK_TOKENRING, token ring},
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241102 - in stable/8: sys/dev/pci usr.sbin/pciconf
Author: gavin
Date: Mon Oct 1 15:47:13 2012
New Revision: 241102
URL: http://svn.freebsd.org/changeset/base/241102
Log:
Merge the following from head:
r240694
Add PCI subclass for NVM Express devices.
r240699, r240739
Recognise NVM devices and pretty-print their name.
Modified:
stable/8/sys/dev/pci/pci.c
stable/8/sys/dev/pci/pcireg.h
stable/8/usr.sbin/pciconf/pciconf.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/pci/ (props changed)
stable/8/usr.sbin/pciconf/ (props changed)
Modified: stable/8/sys/dev/pci/pci.c
==
--- stable/8/sys/dev/pci/pci.c Mon Oct 1 15:47:01 2012(r241101)
+++ stable/8/sys/dev/pci/pci.c Mon Oct 1 15:47:13 2012(r241102)
@@ -3343,6 +3343,7 @@ static struct
{PCIC_STORAGE, PCIS_STORAGE_ATA_ADMA, ATA (ADMA)},
{PCIC_STORAGE, PCIS_STORAGE_SATA, SATA},
{PCIC_STORAGE, PCIS_STORAGE_SAS, SAS},
+ {PCIC_STORAGE, PCIS_STORAGE_NVM, NVM},
{PCIC_NETWORK, -1, network},
{PCIC_NETWORK, PCIS_NETWORK_ETHERNET, ethernet},
{PCIC_NETWORK, PCIS_NETWORK_TOKENRING, token ring},
Modified: stable/8/sys/dev/pci/pcireg.h
==
--- stable/8/sys/dev/pci/pcireg.h Mon Oct 1 15:47:01 2012
(r241101)
+++ stable/8/sys/dev/pci/pcireg.h Mon Oct 1 15:47:13 2012
(r241102)
@@ -263,6 +263,7 @@
#definePCIS_STORAGE_SATA 0x06
#definePCIP_STORAGE_SATA_AHCI_1_0 0x01
#definePCIS_STORAGE_SAS0x07
+#definePCIS_STORAGE_NVM0x08
#definePCIS_STORAGE_OTHER 0x80
#definePCIC_NETWORK0x02
Modified: stable/8/usr.sbin/pciconf/pciconf.c
==
--- stable/8/usr.sbin/pciconf/pciconf.c Mon Oct 1 15:47:01 2012
(r241101)
+++ stable/8/usr.sbin/pciconf/pciconf.c Mon Oct 1 15:47:13 2012
(r241102)
@@ -345,6 +345,7 @@ static struct
{PCIC_STORAGE, PCIS_STORAGE_ATA_ADMA, ATA (ADMA)},
{PCIC_STORAGE, PCIS_STORAGE_SATA, SATA},
{PCIC_STORAGE, PCIS_STORAGE_SAS, SAS},
+ {PCIC_STORAGE, PCIS_STORAGE_NVM, NVM},
{PCIC_NETWORK, -1, network},
{PCIC_NETWORK, PCIS_NETWORK_ETHERNET, ethernet},
{PCIC_NETWORK, PCIS_NETWORK_TOKENRING, token ring},
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241103 - in stable/7: sys/dev/pci usr.sbin/pciconf
Author: gavin
Date: Mon Oct 1 15:47:35 2012
New Revision: 241103
URL: http://svn.freebsd.org/changeset/base/241103
Log:
Merge the following from head:
r240694
Add PCI subclass for NVM Express devices.
r240699, r240739
Recognise NVM devices and pretty-print their name.
Modified:
stable/7/sys/dev/pci/pci.c
stable/7/sys/dev/pci/pcireg.h
stable/7/usr.sbin/pciconf/pciconf.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/usr.sbin/pciconf/ (props changed)
Modified: stable/7/sys/dev/pci/pci.c
==
--- stable/7/sys/dev/pci/pci.c Mon Oct 1 15:47:13 2012(r241102)
+++ stable/7/sys/dev/pci/pci.c Mon Oct 1 15:47:35 2012(r241103)
@@ -3071,6 +3071,7 @@ static struct
{PCIC_STORAGE, PCIS_STORAGE_ATA_ADMA, ATA (ADMA)},
{PCIC_STORAGE, PCIS_STORAGE_SATA, SATA},
{PCIC_STORAGE, PCIS_STORAGE_SAS, SAS},
+ {PCIC_STORAGE, PCIS_STORAGE_NVM, NVM},
{PCIC_NETWORK, -1, network},
{PCIC_NETWORK, PCIS_NETWORK_ETHERNET, ethernet},
{PCIC_NETWORK, PCIS_NETWORK_TOKENRING, token ring},
Modified: stable/7/sys/dev/pci/pcireg.h
==
--- stable/7/sys/dev/pci/pcireg.h Mon Oct 1 15:47:13 2012
(r241102)
+++ stable/7/sys/dev/pci/pcireg.h Mon Oct 1 15:47:35 2012
(r241103)
@@ -263,6 +263,7 @@
#definePCIS_STORAGE_SATA 0x06
#definePCIP_STORAGE_SATA_AHCI_1_0 0x01
#definePCIS_STORAGE_SAS0x07
+#definePCIS_STORAGE_NVM0x08
#definePCIS_STORAGE_OTHER 0x80
#definePCIC_NETWORK0x02
Modified: stable/7/usr.sbin/pciconf/pciconf.c
==
--- stable/7/usr.sbin/pciconf/pciconf.c Mon Oct 1 15:47:13 2012
(r241102)
+++ stable/7/usr.sbin/pciconf/pciconf.c Mon Oct 1 15:47:35 2012
(r241103)
@@ -337,6 +337,7 @@ static struct
{PCIC_STORAGE, PCIS_STORAGE_ATA_ADMA, ATA (ADMA)},
{PCIC_STORAGE, PCIS_STORAGE_SATA, SATA},
{PCIC_STORAGE, PCIS_STORAGE_SAS, SAS},
+ {PCIC_STORAGE, PCIS_STORAGE_NVM, NVM},
{PCIC_NETWORK, -1, network},
{PCIC_NETWORK, PCIS_NETWORK_ETHERNET, ethernet},
{PCIC_NETWORK, PCIS_NETWORK_TOKENRING, token ring},
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241104 - stable/9/sys/dev/usb
Author: gavin Date: Mon Oct 1 15:50:16 2012 New Revision: 241104 URL: http://svn.freebsd.org/changeset/base/241104 Log: Merge r240683 from head Add entries for two USB devices I have locally. Modified: stable/9/sys/dev/usb/usbdevs Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/usbdevs == --- stable/9/sys/dev/usb/usbdevsMon Oct 1 15:47:35 2012 (r241103) +++ stable/9/sys/dev/usb/usbdevsMon Oct 1 15:50:16 2012 (r241104) @@ -407,6 +407,7 @@ vendor ALLIEDCABLE 0x07e6 Allied Cable vendor STSN0x07ef STSN vendor CENTURY 0x07f7 Century Corp vendor NEWLINK 0x07ff NEWlink +vendor MAGTEK 0x0801 Mag-Tek vendor ZOOM0x0803 Zoom Telephonics vendor PCS 0x0810 Personal Communication Systems vendor ALPHASMART 0x081e AlphaSmart, Inc. @@ -2492,6 +2493,9 @@ product LUWEN EASYDISK0x0005 EasyDisc /* Macally products */ product MACALLY MOUSE1 0x0101 mouse +/* Mag-Tek products */ +product MAGTEK USBSWIPE0x0002 USB Mag Stripe Swipe Reader + /* Marvell Technology Group, Ltd. products */ product MARVELL SHEEVAPLUG 0x9e8f SheevaPlug serial interface @@ -3445,6 +3449,7 @@ product RALINK RT3071 0x3071 RT3071 product RALINK RT3072 0x3072 RT3072 product RALINK RT3370 0x3370 RT3370 product RALINK RT3572 0x3572 RT3572 +product RALINK RT5370 0x5370 RT5370 product RALINK RT8070 0x8070 RT8070 product RALINK RT2570_30x9020 RT2500USB Wireless Adapter product RALINK RT2573_20x9021 RT2501USB Wireless Adapter ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241105 - stable/8/sys/dev/usb
Author: gavin Date: Mon Oct 1 15:50:18 2012 New Revision: 241105 URL: http://svn.freebsd.org/changeset/base/241105 Log: Merge r240683 from head Add entries for two USB devices I have locally. Modified: stable/8/sys/dev/usb/usbdevs Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/usb/ (props changed) Modified: stable/8/sys/dev/usb/usbdevs == --- stable/8/sys/dev/usb/usbdevsMon Oct 1 15:50:16 2012 (r241104) +++ stable/8/sys/dev/usb/usbdevsMon Oct 1 15:50:18 2012 (r241105) @@ -404,6 +404,7 @@ vendor ALLIEDCABLE 0x07e6 Allied Cable vendor STSN0x07ef STSN vendor CENTURY 0x07f7 Century Corp vendor NEWLINK 0x07ff NEWlink +vendor MAGTEK 0x0801 Mag-Tek vendor ZOOM0x0803 Zoom Telephonics vendor PCS 0x0810 Personal Communication Systems vendor ALPHASMART 0x081e AlphaSmart, Inc. @@ -2160,6 +2161,9 @@ product LUWEN EASYDISK0x0005 EasyDisc /* Macally products */ product MACALLY MOUSE1 0x0101 mouse +/* Mag-Tek products */ +product MAGTEK USBSWIPE0x0002 USB Mag Stripe Swipe Reader + /* Marvell Technology Group, Ltd. products */ product MARVELL SHEEVAPLUG 0x9e8f SheevaPlug serial interface @@ -2811,6 +2815,7 @@ product RALINK RT3071 0x3071 RT3071 product RALINK RT3072 0x3072 RT3072 product RALINK RT3370 0x3370 RT3370 product RALINK RT3572 0x3572 RT3572 +product RALINK RT5370 0x5370 RT5370 product RALINK RT8070 0x8070 RT8070 product RALINK RT2570_30x9020 RT2500USB Wireless Adapter product RALINK RT2573_20x9021 RT2501USB Wireless Adapter ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241106 - stable/9/usr.sbin/portsnap/portsnap
Author: issyl0 (doc committer) Date: Mon Oct 1 16:34:12 2012 New Revision: 241106 URL: http://svn.freebsd.org/changeset/base/241106 Log: MFC r241024 and r241026 from HEAD: - Add a note to portsnap(8) about the behaviour of the example cron command. - Change only only to only in portsnap(8). PR: docs/171759 Approved by: gjb (mentor) Modified: stable/9/usr.sbin/portsnap/portsnap/portsnap.8 Directory Properties: stable/9/usr.sbin/portsnap/ (props changed) Modified: stable/9/usr.sbin/portsnap/portsnap/portsnap.8 == --- stable/9/usr.sbin/portsnap/portsnap/portsnap.8 Mon Oct 1 15:50:18 2012(r241105) +++ stable/9/usr.sbin/portsnap/portsnap/portsnap.8 Mon Oct 1 16:34:12 2012(r241106) @@ -25,7 +25,7 @@ .\ .\ $FreeBSD$ .\ -.Dd September 15, 2008 +.Dd September 28, 2012 .Dt PORTSNAP 8 .Os FreeBSD .Sh NAME @@ -174,6 +174,23 @@ can quickly be extracted into If your clock is set to UTC, please pick a random time other than 3AM, to avoid overly imposing an uneven load on the server(s) hosting the snapshots. +.Pp +Note that running +.Nm +.Cm cron +or +.Nm +.Cm fetch +does not apply the changes that were received: they only download +them. +To apply the changes, you must follow these commands with +.Nm +.Cm update . +The +.Nm +.Cm update +command is normally run by hand at a time when you are sure that +no one is manually working in the ports tree. .It Running .Nm ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241107 - head/usr.sbin/pw
Author: bapt
Date: Mon Oct 1 16:42:07 2012
New Revision: 241107
URL: http://svn.freebsd.org/changeset/base/241107
Log:
Remove useless atoi(3), previous strspn(3) makes sure that a_name-val is a
number.
This also allow pw user show to work as expected.
PR: bin/172112
Submitted by: Ilya A. Arkhipov rum1...@yandex.ru
MFC after:1 month
Modified:
head/usr.sbin/pw/pw_user.c
Modified: head/usr.sbin/pw/pw_user.c
==
--- head/usr.sbin/pw/pw_user.c Mon Oct 1 16:34:12 2012(r241106)
+++ head/usr.sbin/pw/pw_user.c Mon Oct 1 16:42:07 2012(r241107)
@@ -314,8 +314,7 @@ pw_user(struct userconf * cnf, int mode,
* know.
*/
if (mode != M_ADD pwd == NULL
-strspn(a_name-val, 0123456789) == strlen(a_name-val)
-atoi(a_name-val) 0) { /* Assume uid */
+strspn(a_name-val, 0123456789) ==
strlen(a_name-val)) {
(a_uid = a_name)-ch = 'u';
a_name = NULL;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241108 - head/usr.sbin/pw
Author: bapt
Date: Mon Oct 1 17:00:33 2012
New Revision: 241108
URL: http://svn.freebsd.org/changeset/base/241108
Log:
Do not treat empty name as an uid 0
Reported by: Robert Bonomi bon...@mail.r-bonomi.com
Modified:
head/usr.sbin/pw/pw_user.c
Modified: head/usr.sbin/pw/pw_user.c
==
--- head/usr.sbin/pw/pw_user.c Mon Oct 1 16:42:07 2012(r241107)
+++ head/usr.sbin/pw/pw_user.c Mon Oct 1 17:00:33 2012(r241108)
@@ -314,7 +314,8 @@ pw_user(struct userconf * cnf, int mode,
* know.
*/
if (mode != M_ADD pwd == NULL
-strspn(a_name-val, 0123456789) ==
strlen(a_name-val)) {
+strspn(a_name-val, 0123456789) == strlen(a_name-val)
+*a_name-val) {
(a_uid = a_name)-ch = 'u';
a_name = NULL;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241109 - in stable/9/sys: amd64/conf i386/conf
Author: jhb Date: Mon Oct 1 17:45:56 2012 New Revision: 241109 URL: http://svn.freebsd.org/changeset/base/241109 Log: MFC 239771: Fix misspelled Infiniband. Modified: stable/9/sys/amd64/conf/NOTES stable/9/sys/i386/conf/NOTES Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/dev/e1000/ (props changed) stable/9/sys/dev/isp/ (props changed) stable/9/sys/dev/ixgbe/ (props changed) stable/9/sys/dev/puc/ (props changed) stable/9/sys/fs/ (props changed) stable/9/sys/fs/ntfs/ (props changed) stable/9/sys/modules/ (props changed) Modified: stable/9/sys/amd64/conf/NOTES == --- stable/9/sys/amd64/conf/NOTES Mon Oct 1 17:00:33 2012 (r241108) +++ stable/9/sys/amd64/conf/NOTES Mon Oct 1 17:45:56 2012 (r241109) @@ -98,7 +98,7 @@ options OFED_DEBUG_INIT optionsSDP optionsSDP_DEBUG -# IP over Inifiband +# IP over Infiniband optionsIPOIB optionsIPOIB_DEBUG optionsIPOIB_CM Modified: stable/9/sys/i386/conf/NOTES == --- stable/9/sys/i386/conf/NOTESMon Oct 1 17:00:33 2012 (r241108) +++ stable/9/sys/i386/conf/NOTESMon Oct 1 17:45:56 2012 (r241109) @@ -268,7 +268,7 @@ options OFED_DEBUG_INIT optionsSDP optionsSDP_DEBUG -# IP over Inifiband +# IP over Infiniband optionsIPOIB optionsIPOIB_DEBUG optionsIPOIB_CM ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r241053 - in head/sys/boot: common i386/libi386 uboot/lib userboot/userboot
On Monday, October 01, 2012 11:22:39 am Andrey V. Elsukov wrote: On 01.10.2012 15:53, John Baldwin wrote: Introduce new cache layer to resolve this problem. It is independent and doesn't need initialization like bcache, and will work by default for all loaders which use the new DISK API. A successful disk_open() call to each new disk or partition produces new entry in the cache. Even more, when disk was already open, now opening of any nested partitions does not require reading top level partition table. So, if without this cache, partition table metadata was read around 20-50 times during boot, now it reads only once. This affects the booting from GPT and MBR from the UFS. ...and removes support for removable media like floppies. That may be the proper thing to do at this stage (though I think that affects PC98 still perhaps?) However, removing suppot for removable media should be an intentional decision, not a side effect. The bcache was simplistic precisely to support floppies. Hi, John, I think it shouldn't affect floppies support. I'm unable to test this, and I don't remember exactly, but floppies don't have partition tables, or just have simple MBR. So, when access to the floppy will be performed first time, the following cache entry will be created disk0: - some_offset, probably an offset will be zero. And when you change the floppy this offset still remain the same. There is a lot of other places in the libstand, where similar behavior still remain (i mean, one operation initiates several unneeded reads): The floppies used in BSD either have BSD labels or are a DOS floppy with no partition table. * Each open() call initiates read file system metadata. * We have the support of different file systems. Some of those are real file systems, other aren't - gzip, bzip, split. During boot loader tries to open several files, which don't exists by default. Each this attempt initiates reading of metadata of each file system several times. Why? When we do first read we can determine that we have UFS on this media, why do we trying search msdos or ext2fs here? Think about removable media. If you have replaced the media (such as a floppy), then what was once UFS may now be FAT16. Ok, when we fail to open this file on the all of file systems, we are going to try them again with .gz extension... Yes, the current code is not very optimal. The focus on it to date has been to make sure it works. It is only used for bootstrapping, not once the main system is up and running, so at least in the past performance has been less important than correctness. One could perhaps differentiate removable vs non-removable media (and allow more caching on non-removable media) so long as one distinguish a USB stick so as to mark it as removable media. (Either that or we say that we no longer support swapping removable media during the boot process.) -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241110 - in stable/9/sys: powerpc/powerpc x86/x86
Author: jhb
Date: Mon Oct 1 19:09:25 2012
New Revision: 241110
URL: http://svn.freebsd.org/changeset/base/241110
Log:
MFC 239008,239020:
Improve the handling of static DMA buffers that use non-default memory
attributes (currently just BUS_DMA_NOCACHE):
- Don't call pmap_change_attr() on the returned address, instead use
kmem_alloc_contig() to ask the VM system for memory with the requested
attribute.
- As a result, always use kmem_alloc_contig() for non-default memory
attributes, even for sub-page allocations. This requires adjusting
bus_dmamem_free()'s logic for determining which free routine to use.
- For x86, add a new dummy bus_dmamap that is used for static DMA
buffers allocated via kmem_alloc_contig(). bus_dmamem_free() can then
use the map pointer to determine which free routine to use.
- For powerpc, add a new flag to the allocated map (bus_dmamem_alloc()
always creates a real map on powerpc) to indicate which free routine
should be used.
Note that the BUS_DMA_NOCACHE handling in powerpc is currently #ifdef'd out.
I have left it disabled but updated it to match x86.
Modified:
stable/9/sys/powerpc/powerpc/busdma_machdep.c
stable/9/sys/x86/x86/busdma_machdep.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/dev/e1000/ (props changed)
stable/9/sys/dev/isp/ (props changed)
stable/9/sys/dev/ixgbe/ (props changed)
stable/9/sys/dev/puc/ (props changed)
stable/9/sys/fs/ (props changed)
stable/9/sys/fs/ntfs/ (props changed)
stable/9/sys/modules/ (props changed)
Modified: stable/9/sys/powerpc/powerpc/busdma_machdep.c
==
--- stable/9/sys/powerpc/powerpc/busdma_machdep.c Mon Oct 1 17:45:56
2012(r241109)
+++ stable/9/sys/powerpc/powerpc/busdma_machdep.c Mon Oct 1 19:09:25
2012(r241110)
@@ -46,6 +46,8 @@ __FBSDID($FreeBSD$);
#include sys/sysctl.h
#include vm/vm.h
+#include vm/vm_extern.h
+#include vm/vm_kern.h
#include vm/vm_page.h
#include vm/vm_map.h
@@ -129,6 +131,7 @@ struct bus_dmamap {
bus_dmamap_callback_t *callback;
void *callback_arg;
STAILQ_ENTRY(bus_dmamap) links;
+ intcontigalloc;
};
static STAILQ_HEAD(, bus_dmamap) bounce_map_waitinglist;
@@ -488,6 +491,7 @@ int
bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
bus_dmamap_t *mapp)
{
+ vm_memattr_t attr;
int mflags;
if (flags BUS_DMA_NOWAIT)
@@ -499,6 +503,12 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, voi
if (flags BUS_DMA_ZERO)
mflags |= M_ZERO;
+#ifdef NOTYET
+ if (flags BUS_DMA_NOCACHE)
+ attr = VM_MEMATTR_UNCACHEABLE;
+ else
+#endif
+ attr = VM_MEMATTR_DEFAULT;
/*
* XXX:
@@ -510,7 +520,8 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, voi
*/
if ((dmat-maxsize = PAGE_SIZE)
(dmat-alignment dmat-maxsize)
- dmat-lowaddr = ptoa((vm_paddr_t)Maxmem)) {
+ dmat-lowaddr = ptoa((vm_paddr_t)Maxmem)
+ attr == VM_MEMATTR_DEFAULT) {
*vaddr = malloc(dmat-maxsize, M_DEVBUF, mflags);
} else {
/*
@@ -519,9 +530,10 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, voi
* multi-seg allocations yet though.
* XXX Certain AGP hardware does.
*/
- *vaddr = contigmalloc(dmat-maxsize, M_DEVBUF, mflags,
- 0ul, dmat-lowaddr, dmat-alignment? dmat-alignment : 1ul,
- dmat-boundary);
+ *vaddr = (void *)kmem_alloc_contig(kernel_map, dmat-maxsize,
+ mflags, 0ul, dmat-lowaddr, dmat-alignment ?
+ dmat-alignment : 1ul, dmat-boundary, attr);
+ (*mapp)-contigalloc = 1;
}
if (*vaddr == NULL) {
CTR4(KTR_BUSDMA, %s: tag %p tag flags 0x%x error %d,
@@ -530,11 +542,6 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, voi
} else if (vtophys(*vaddr) (dmat-alignment - 1)) {
printf(bus_dmamem_alloc failed to align memory properly.\n);
}
-#ifdef NOTYET
- if (flags BUS_DMA_NOCACHE)
-
svn commit: r241111 - stable/9/share/doc/smm
Author: jhb
Date: Mon Oct 1 19:13:47 2012
New Revision: 24
URL: http://svn.freebsd.org/changeset/base/24
Log:
MFC 239739:
Don't build and install the 07.lpd doc if WITHOUT_LPR is set.
Modified:
stable/9/share/doc/smm/Makefile
Directory Properties:
stable/9/share/doc/smm/ (props changed)
Modified: stable/9/share/doc/smm/Makefile
==
--- stable/9/share/doc/smm/Makefile Mon Oct 1 19:09:25 2012
(r241110)
+++ stable/9/share/doc/smm/Makefile Mon Oct 1 19:13:47 2012
(r24)
@@ -18,7 +18,7 @@ SUBDIR= title \
04.quotas \
05.fastfs \
06.nfs \
- 07.lpd \
+ ${_07.lpd} \
${_08.sendmailop} \
11.timedop \
12.timed \
@@ -28,4 +28,8 @@ SUBDIR= title \
_08.sendmailop=08.sendmailop
.endif
+.if ${MK_LPR} != no
+_07.lpd= 07.lpd
+.endif
+
.include bsd.subdir.mk
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241112 - stable/9/sys/kern
Author: jhb Date: Mon Oct 1 19:22:53 2012 New Revision: 241112 URL: http://svn.freebsd.org/changeset/base/241112 Log: MFC 239779: Shorten the name of the fast SWI taskqueue to fast taskq so that it fits. Modified: stable/9/sys/kern/subr_taskqueue.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/dev/e1000/ (props changed) stable/9/sys/dev/isp/ (props changed) stable/9/sys/dev/ixgbe/ (props changed) stable/9/sys/dev/puc/ (props changed) stable/9/sys/fs/ (props changed) stable/9/sys/fs/ntfs/ (props changed) stable/9/sys/modules/ (props changed) Modified: stable/9/sys/kern/subr_taskqueue.c == --- stable/9/sys/kern/subr_taskqueue.c Mon Oct 1 19:13:47 2012 (r24) +++ stable/9/sys/kern/subr_taskqueue.c Mon Oct 1 19:22:53 2012 (r241112) @@ -565,7 +565,7 @@ taskqueue_fast_run(void *dummy) } TASKQUEUE_FAST_DEFINE(fast, taskqueue_fast_enqueue, NULL, - swi_add(NULL, Fast task queue, taskqueue_fast_run, NULL, + swi_add(NULL, fast taskq, taskqueue_fast_run, NULL, SWI_TQ_FAST, INTR_MPSAFE, taskqueue_fast_ih)); int ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241113 - stable/8/sys/kern
Author: jhb Date: Mon Oct 1 19:43:37 2012 New Revision: 241113 URL: http://svn.freebsd.org/changeset/base/241113 Log: MFC 239779: Shorten the name of the fast SWI taskqueue to fast taskq so that it fits. Modified: stable/8/sys/kern/subr_taskqueue.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/kern/ (props changed) Modified: stable/8/sys/kern/subr_taskqueue.c == --- stable/8/sys/kern/subr_taskqueue.c Mon Oct 1 19:22:53 2012 (r241112) +++ stable/8/sys/kern/subr_taskqueue.c Mon Oct 1 19:43:37 2012 (r241113) @@ -454,7 +454,7 @@ taskqueue_fast_run(void *dummy) } TASKQUEUE_FAST_DEFINE(fast, taskqueue_fast_enqueue, NULL, - swi_add(NULL, Fast task queue, taskqueue_fast_run, NULL, + swi_add(NULL, fast taskq, taskqueue_fast_run, NULL, SWI_TQ_FAST, INTR_MPSAFE, taskqueue_fast_ih)); int ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241114 - head/sys/i386/conf
Author: ken Date: Mon Oct 1 21:42:32 2012 New Revision: 241114 URL: http://svn.freebsd.org/changeset/base/241114 Log: Add the mps(4) driver to the i386 GENERIC config file. LSI has tested it on i386 and verified that it works. Submitted by: Harald Schmalzbauer, John Baldwin, Kashyap Desai MFC after:3 days Modified: head/sys/i386/conf/GENERIC Modified: head/sys/i386/conf/GENERIC == --- head/sys/i386/conf/GENERIC Mon Oct 1 19:43:37 2012(r241113) +++ head/sys/i386/conf/GENERIC Mon Oct 1 21:42:32 2012(r241114) @@ -121,6 +121,7 @@ device hptiop # Highpoint RocketRaid 3 device isp # Qlogic family #deviceispfw # Firmware for QLogic HBAs- normally a module device mpt # LSI-Logic MPT-Fusion +device mps # LSI-Logic MPT-Fusion 2 #devicencr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') device trm # Tekram DC395U/UW/F DC315U adapters ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241115 - head/share/examples/cvsup
Author: eadler Date: Mon Oct 1 22:27:34 2012 New Revision: 241115 URL: http://svn.freebsd.org/changeset/base/241115 Log: Indicate (loudly) that ports csup is going away. While here clarify some other portions. Approved by: cperciva (implicit) MFC after:3 days Modified: head/share/examples/cvsup/ports-supfile Modified: head/share/examples/cvsup/ports-supfile == --- head/share/examples/cvsup/ports-supfile Mon Oct 1 21:42:32 2012 (r241114) +++ head/share/examples/cvsup/ports-supfile Mon Oct 1 22:27:34 2012 (r241115) @@ -1,15 +1,20 @@ # $FreeBSD$ # # This file contains all of the CVSup collections that make up the -# FreeBSD-current ports collection. +# ports collection. # # csup (CVS Update Protocol) allows you to download the latest CVS # tree (or any branch of development therefrom) to your system easily # and efficiently -# -# To keep your CVS tree up-to-date run: -# -# csup ports-supfile +# _ +# __ _ _ __ _ __ (_)_ __ __ _ +# \ \ /\ / / _` | '__| '_ \| | '_ \ / _` | +# \ V V / (_| | | | | | | | | | | (_| | +# \_/\_/ \__,_|_| |_| |_|_|_| |_|\__, | +# |___/ +# cvsup for ports is being phased out as of 28 February 2013 and its +# use is discouraged. Users are advised to migrate to portsnap +# or svn directly. # # Note that this only updates the tree contents and does not # update what is actually installed. @@ -63,11 +68,13 @@ ports-all # These are the individual collections that make up ports-all. If you # use these, be sure to comment out ports-all above. -# + # Be sure to ALWAYS cvsup the ports-base collection if you use any of the # other individual collections below. ports-base is a mandatory collection # for the ports collection, and your ports may not build correctly if it # is not kept up to date. +# +# Use of individual collections is not a supported configuration. #ports-base #ports-accessibility #ports-arabic ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241116 - head/games/fortune/datfiles
Author: eadler Date: Tue Oct 2 00:30:15 2012 New Revision: 241116 URL: http://svn.freebsd.org/changeset/base/241116 Log: Correct the tip about finding all the directories on the system Add a tip about clearing the screen. Make things more consistent by removing quotes around 'make search' Approved by: cperciva MFC after:3 days Modified: head/games/fortune/datfiles/freebsd-tips Modified: head/games/fortune/datfiles/freebsd-tips == --- head/games/fortune/datfiles/freebsd-tipsMon Oct 1 22:27:34 2012 (r241115) +++ head/games/fortune/datfiles/freebsd-tipsTue Oct 2 00:30:15 2012 (r241116) @@ -272,8 +272,11 @@ will search '/', and all subdirectories, % To see all of the directories on your FreeBSD system, type - ls -R / | less - -- Dru gene...@istar.ca + find / -type d | less + +All the files? + + find / -type f | less % To see how long it takes a command to run, type the word time before the command name. @@ -315,9 +318,9 @@ and they can be combined as ls -FG. Want to find a specific port, just type the following under /usr/ports or one its subdirectories: - make search name=port-name + make search name=port-name or - make search key=keyword + make search key=keyword % Want to know how many words, lines, or bytes are contained in a file? Type wc filename. @@ -422,6 +425,8 @@ You can press Ctrl-D to quickly exit fro login shell. -- Konstantinos Konstantinidis kkons...@duth.gr % +You can press Ctrl-L while in the shell to clear the screen. +% You can press up-arrow or down-arrow to walk through a list of previous commands in tcsh. % ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241117 - head/usr.bin/procstat
Author: eadler Date: Tue Oct 2 00:30:20 2012 New Revision: 241117 URL: http://svn.freebsd.org/changeset/base/241117 Log: add SG state type PR: bin/171664 Submitted by: Jan Beich jbe...@tormail.org Approved by: cperciva MFC after:1 week Modified: head/usr.bin/procstat/procstat.1 Modified: head/usr.bin/procstat/procstat.1 == --- head/usr.bin/procstat/procstat.1Tue Oct 2 00:30:15 2012 (r241116) +++ head/usr.bin/procstat/procstat.1Tue Oct 2 00:30:20 2012 (r241117) @@ -418,6 +418,8 @@ default device .It ph physical +.It sg +scatter/gather .It sw swap .It vn ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241118 - head/usr.bin/mktemp
Author: eadler
Date: Tue Oct 2 00:30:26 2012
New Revision: 241118
URL: http://svn.freebsd.org/changeset/base/241118
Log:
Implement the Sun/GNU extension of using a default
prefix when no arguments are supplied.
Reviewed by: jilles
Approved by: cperciva
MFC after:1 week
Modified:
head/usr.bin/mktemp/mktemp.1
head/usr.bin/mktemp/mktemp.c
Modified: head/usr.bin/mktemp/mktemp.1
==
--- head/usr.bin/mktemp/mktemp.1Tue Oct 2 00:30:20 2012
(r241117)
+++ head/usr.bin/mktemp/mktemp.1Tue Oct 2 00:30:26 2012
(r241118)
@@ -99,6 +99,14 @@ Care should
be taken to ensure that it is appropriate to use an environment variable
potentially supplied by the user.
.Pp
+If no arguments are passed or if only the
+.Fl d
+flag is passed
+.Nm
+behaves as if
+.Fl t Li tmp
+was supplied.
+.Pp
Any number of temporary files may be created in a single invocation,
including one based on the internal template resulting from the
.Fl t
Modified: head/usr.bin/mktemp/mktemp.c
==
--- head/usr.bin/mktemp/mktemp.cTue Oct 2 00:30:20 2012
(r241117)
+++ head/usr.bin/mktemp/mktemp.cTue Oct 2 00:30:26 2012
(r241118)
@@ -87,6 +87,11 @@ main(int argc, char **argv)
argc -= optind;
argv += optind;
+ if (!tflag argc 1) {
+ tflag = 1;
+ prefix = tmp;
+ }
+
if (tflag) {
tmpdir = getenv(TMPDIR);
if (tmpdir == NULL)
@@ -100,8 +105,6 @@ main(int argc, char **argv)
else
errx(1, cannot generate template);
}
- } else if (argc 1) {
- usage();
}
/* generate all requested files */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r241119 - head/sys/kern
Author: eadler
Date: Tue Oct 2 03:33:41 2012
New Revision: 241119
URL: http://svn.freebsd.org/changeset/base/241119
Log:
Provide a generic way to disable devices at boot time
PR: kern/119202
Requested by: peterj
Reviewed by: sbruno, jhb
Approved by: cperciva
MFC after:1 week
Modified:
head/sys/kern/subr_bus.c
Modified: head/sys/kern/subr_bus.c
==
--- head/sys/kern/subr_bus.cTue Oct 2 00:30:26 2012(r241118)
+++ head/sys/kern/subr_bus.cTue Oct 2 03:33:41 2012(r241119)
@@ -2762,6 +2762,13 @@ device_attach(device_t dev)
{
int error;
+ if (resource_disabled(dev-driver-name, dev-unit)) {
+ device_disable(dev);
+ if (bootverbose)
+device_printf(dev, disabled via hints entry\n);
+ return (ENXIO);
+ }
+
device_sysctl_init(dev);
if (!device_is_quiet(dev))
device_print_child(dev-parent, dev);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
