Re: svn commit: r254544 - head/sys/vm

[Andriy Gapon]

on 20/08/2013 02:54 Jeff Roberson said the following:
 Author: jeff
 Date: Mon Aug 19 23:54:24 2013
 New Revision: 254544
 URL: http://svnweb.freebsd.org/changeset/base/254544
 
 Log:
- Increase the active lru refresh interval to 10 minutes.  This has been
  shown to negatively impact some workloads and the goal is only to
  eliminate worst case behaviors for very long periods of paging
  inactivity.  Eventually we should determine a more complex scaling
  factor for this feature.
- Rate limit low memory callback handlers to limit thrashing.  Set the
  default to 10 seconds.

I wonder if an impact of this rate limiting change on ZFS ARC behavior has been
evaluated...

   Sponsored by:   EMC / Isilon Storage Division
 
 Modified:
   head/sys/vm/vm_pageout.c
 
 Modified: head/sys/vm/vm_pageout.c
 ==
 --- head/sys/vm/vm_pageout.c  Mon Aug 19 23:02:39 2013(r254543)
 +++ head/sys/vm/vm_pageout.c  Mon Aug 19 23:54:24 2013(r254544)
 @@ -159,6 +159,8 @@ static int vm_max_launder = 32;
  static int vm_pageout_update_period;
  static int defer_swap_pageouts;
  static int disable_swap_pageouts;
 +static int lowmem_period = 10;
 +static int lowmem_ticks;
  
  #if defined(NO_SWAPPING)
  static int vm_swap_enabled = 0;
 @@ -179,6 +181,9 @@ SYSCTL_INT(_vm, OID_AUTO, pageout_update
   CTLFLAG_RW, vm_pageout_update_period, 0,
   Maximum active LRU update period);

 +SYSCTL_INT(_vm, OID_AUTO, lowmem_period, CTLFLAG_RW, lowmem_period, 0,
 + Low memory callback period);
 +
  #if defined(NO_SWAPPING)
  SYSCTL_INT(_vm, VM_SWAPPING_ENABLED, swap_enabled,
   CTLFLAG_RD, vm_swap_enabled, 0, Enable entire process swapout);
 @@ -901,9 +906,10 @@ vm_pageout_scan(struct vm_domain *vmd, i
  
   /*
* If we need to reclaim memory ask kernel caches to return
 -  * some.
 +  * some.  We rate limit to avoid thrashing.
*/
 - if (pass  0) {
 + if (vmd == vm_dom[0]  pass  0 
 + lowmem_ticks + (lowmem_period * hz)  ticks) {
   /*
* Decrease registered cache sizes.
*/
 @@ -913,6 +919,7 @@ vm_pageout_scan(struct vm_domain *vmd, i
* drained above.
*/
   uma_reclaim();
 + lowmem_ticks = ticks;
   }
  
   /*
 @@ -1680,10 +1687,11 @@ vm_pageout(void)
  
   /*
* Set interval in seconds for active scan.  We want to visit each
 -  * page at least once a minute.
 +  * page at least once every ten minutes.  This is to prevent worst
 +  * case paging behaviors with stale active LRU.
*/
   if (vm_pageout_update_period == 0)
 - vm_pageout_update_period = 60;
 + vm_pageout_update_period = 600;
  
   /* XXX does not really belong here */
   if (vm_page_max_wired == 0)
 


-- 
Andriy Gapon
___
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: r260904 - head/lib/libfetch

[Dag-Erling Smørgrav]

Author: des
Date: Mon Jan 20 11:13:05 2014
New Revision: 260904
URL: http://svnweb.freebsd.org/changeset/base/260904

Log:
  Fix format string.
  
  Submitted by: Jörg Sonnenberger jo...@netbsd.org
  MFC after:1 week

Modified:
  head/lib/libfetch/common.c

Modified: head/lib/libfetch/common.c
==
--- head/lib/libfetch/common.c  Mon Jan 20 07:09:19 2014(r260903)
+++ head/lib/libfetch/common.c  Mon Jan 20 11:13:05 2014(r260904)
@@ -679,7 +679,7 @@ fetch_ssl_setup_transport_layer(SSL_CTX 
if (getenv(SSL_NO_TLS1) != NULL)
ssl_ctx_options |= SSL_OP_NO_TLSv1;
if (verbose)
-   fetch_info(SSL options: %x, ssl_ctx_options);
+   fetch_info(SSL options: %lx, ssl_ctx_options);
SSL_CTX_set_options(ctx, ssl_ctx_options);
 }
 
___
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: r260906 - in stable/10: sbin/kldload share/man/man4

[Baptiste Daroussin]

Author: bapt
Date: Mon Jan 20 14:37:02 2014
New Revision: 260906
URL: http://svnweb.freebsd.org/changeset/base/260906

Log:
  MFH: r260483, r260484, r260594, r260595, r260596, r260597
  
  Improve error message shown to the user when trying to load a module that is
  already loaded or compiled withing the kernel
  Point the user to dmesg(1) to get informations about why loading a module did 
fail
  instead of printing the cryptic Exec format error
  Update the BUGS section of kld(4) according the recent changes in kldload(8)

Modified:
  stable/10/sbin/kldload/kldload.c
  stable/10/share/man/man4/kld.4
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/kldload/kldload.c
==
--- stable/10/sbin/kldload/kldload.cMon Jan 20 12:11:47 2014
(r260905)
+++ stable/10/sbin/kldload/kldload.cMon Jan 20 14:37:02 2014
(r260906)
@@ -181,7 +181,22 @@ main(int argc, char** argv)
printf(%s is already 
loaded\n, argv[0]);
} else {
-   warn(can't load %s, argv[0]);
+   switch (errno) {
+   case EEXIST:
+   warnx(can't load %s: module 
+   already loaded or 
+   in kernel, argv[0]);
+   break;
+   case ENOEXEC:
+   warnx(an error occurred while 
+   loading the module. 
+   Please check dmesg(8) for 
+   more details.);
+   break;
+   default:
+   warn(can't load %s, argv[0]);
+   break;
+   }
errors++;
}
} else {

Modified: stable/10/share/man/man4/kld.4
==
--- stable/10/share/man/man4/kld.4  Mon Jan 20 12:11:47 2014
(r260905)
+++ stable/10/share/man/man4/kld.4  Mon Jan 20 14:37:02 2014
(r260906)
@@ -25,7 +25,7 @@
 .\
 .\ $FreeBSD$
 .\
-.Dd November 8, 1998
+.Dd January 13, 2014
 .Dt KLD 4
 .Os
 .Sh NAME
@@ -166,8 +166,8 @@ binary, then
 fails to execute the entry point.
 .Pp
 .Xr kldload 8
-returns the cryptic message
-.Sq Li ENOEXEC (Exec format error)
+points the user to read
+.Xr dmesg 8
 for any error encountered while loading a module.
 .Pp
 When system internal interfaces change, old modules often cannot
___
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: r260909 - in stable/9: sbin/kldload share/man/man4

[Baptiste Daroussin]

Author: bapt
Date: Mon Jan 20 15:33:31 2014
New Revision: 260909
URL: http://svnweb.freebsd.org/changeset/base/260909

Log:
  MFH: r260483, r260484, r260594, r260595, r260596, r260597
  
  Improve error message shown to the user when trying to load a module that is
  already loaded or compiled withing the kernel
  Point the user to dmesg(1) to get informations about why loading a module did 
fail
  instead of printing the cryptic Exec format error
  Update the BUGS section of kld(4) according the recent changes in kldload(8)

Modified:
  stable/9/sbin/kldload/kldload.c
  stable/9/share/man/man4/kld.4
Directory Properties:
  stable/9/sbin/   (props changed)
  stable/9/sbin/kldload/   (props changed)
  stable/9/share/   (props changed)
  stable/9/share/man/   (props changed)
  stable/9/share/man/man4/   (props changed)

Modified: stable/9/sbin/kldload/kldload.c
==
--- stable/9/sbin/kldload/kldload.c Mon Jan 20 15:00:21 2014
(r260908)
+++ stable/9/sbin/kldload/kldload.c Mon Jan 20 15:33:31 2014
(r260909)
@@ -181,7 +181,22 @@ main(int argc, char** argv)
printf(%s is already 
loaded\n, argv[0]);
} else {
-   warn(can't load %s, argv[0]);
+   switch (errno) {
+   case EEXIST:
+   warnx(can't load %s: module 
+   already loaded or 
+   in kernel, argv[0]);
+   break;
+   case ENOEXEC:
+   warnx(an error occurred while 
+   loading the module. 
+   Please check dmesg(8) for 
+   more details.);
+   break;
+   default:
+   warn(can't load %s, argv[0]);
+   break;
+   }
errors++;
}
} else {

Modified: stable/9/share/man/man4/kld.4
==
--- stable/9/share/man/man4/kld.4   Mon Jan 20 15:00:21 2014
(r260908)
+++ stable/9/share/man/man4/kld.4   Mon Jan 20 15:33:31 2014
(r260909)
@@ -25,7 +25,7 @@
 .\
 .\ $FreeBSD$
 .\
-.Dd November 8, 1998
+.Dd January 13, 2014
 .Dt KLD 4
 .Os
 .Sh NAME
@@ -166,8 +166,8 @@ binary, then
 fails to execute the entry point.
 .Pp
 .Xr kldload 8
-returns the cryptic message
-.Sq Li ENOEXEC (Exec format error)
+points the user to read
+.Xr dmesg 8
 for any error encountered while loading a module.
 .Pp
 When system internal interfaces change, old modules often cannot
___
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: r260910 - head/usr.sbin/pciconf

[John Baldwin]

Author: jhb
Date: Mon Jan 20 15:51:02 2014
New Revision: 260910
URL: http://svnweb.freebsd.org/changeset/base/260910

Log:
  - Allow PCI devices that are attached to a driver to be identified by their
device name instead of just the selector.
  - Accept an optional device argument to -l to restrict the output to only
listing details about a single device.  This is mostly useful in
conjunction with other flags like -e or -c to allow a user to query
details about a single device.
  
  MFC after:1 week

Modified:
  head/usr.sbin/pciconf/pciconf.8
  head/usr.sbin/pciconf/pciconf.c

Modified: head/usr.sbin/pciconf/pciconf.8
==
--- head/usr.sbin/pciconf/pciconf.8 Mon Jan 20 15:33:31 2014
(r260909)
+++ head/usr.sbin/pciconf/pciconf.8 Mon Jan 20 15:51:02 2014
(r260910)
@@ -25,7 +25,7 @@
 .\
 .\ $FreeBSD$
 .\
-.Dd June 1, 2012
+.Dd January 20, 2014
 .Dt PCICONF 8
 .Os
 .Sh NAME
@@ -33,13 +33,13 @@
 .Nd diagnostic utility for the PCI bus
 .Sh SYNOPSIS
 .Nm
-.Fl l Op Fl bcev
+.Fl l Oo Fl bcev Oc Op Ar device
 .Nm
-.Fl a Ar selector
+.Fl a Ar device
 .Nm
-.Fl r Oo Fl b | h Oc Ar selector addr Ns Op : Ns Ar addr2
+.Fl r Oo Fl b | h Oc Ar device addr Ns Op : Ns Ar addr2
 .Nm
-.Fl w Oo Fl b | h Oc Ar selector addr value
+.Fl w Oo Fl b | h Oc Ar device addr value
 .Sh DESCRIPTION
 The
 .Nm
@@ -54,7 +54,9 @@ normally only the super-user.
 .Pp
 With the
 .Fl l
-option, it lists all devices found by the boot probe in the following format:
+option,
+.Nm
+lists PCI devices in the following format:
 .Bd -literal
 foo0@pci0:0:4:0: class=0x01 card=0x chip=0x000f1000 rev=0x01 \
 hdr=0x00
@@ -65,16 +67,14 @@ hdr=0x00
 .Ed
 .Pp
 The first column gives the
-device name, unit number, and
-.Ar selector .
-If there is no device configured in the kernel for the
+driver name, unit number, and selector .
+If there is no driver attached to the
 .Tn PCI
-device in question, the device name will be
+device in question, the driver name will be
 .Dq none .
-Unit numbers for unconfigured devices start at zero and are incremented for
-each unconfigured device that is encountered.
-The
-.Ar selector
+Unit numbers for detached devices start at zero and are incremented for
+each detached device that is encountered.
+The selector
 is in a form which may directly be used for the other forms of the command.
 The second column is the class code, with the class byte printed as two
 hex digits, followed by the sub-class and the interface bytes.
@@ -182,18 +182,36 @@ option is supplied,
 will attempt to load the vendor/device information database, and print
 vendor, device, class and subclass identification strings for each device.
 .Pp
+If the optional
+.Ar device
+argument is given with the
+.Fl l
+flag,
+.Nm
+will only list details about a single device instead of all devices.
+.Pp
 All invocations of
 .Nm
 except for
 .Fl l
 require a
-.Ar selector
-of the form
+.Ar device .
+The device can be identified either by a device name if the device is
+attached to a driver or by a selector.
+Selectors identify a PCI device by its address in PCI config space and
+can take one of the following forms:
+.Pp
+.Bl -bullet -offset indent -compact
+.It
 .Li pci Ns Va domain Ns \: Ns Va bus Ns \: Ns Va device Ns \: \
-Ns Va function Ns ,
-.Li pci Ns Va bus Ns \: Ns Va device Ns \: Ns Va function Ns , or
-.Li pci Ns Va bus Ns \: Ns Va device Ns .
-In case of an abridged form, omitted selector components are assumed to be 0.
+Ns Va function Ns
+.It
+.Li pci Ns Va bus Ns \: Ns Va device Ns \: Ns Va function Ns
+.It
+.Li pci Ns Va bus Ns \: Ns Va device Ns
+.El
+.Pp
+In the case of an abridged form, omitted selector components are assumed to be 
0.
 An optional leading device name followed by @ and an optional final colon
 will be ignored; this is so that the first column in the output of
 .Nm

Modified: head/usr.sbin/pciconf/pciconf.c
==
--- head/usr.sbin/pciconf/pciconf.c Mon Jan 20 15:33:31 2014
(r260909)
+++ head/usr.sbin/pciconf/pciconf.c Mon Jan 20 15:51:02 2014
(r260910)
@@ -35,6 +35,7 @@ static const char rcsid[] =
 #include sys/types.h
 #include sys/fcntl.h
 
+#include assert.h
 #include ctype.h
 #include err.h
 #include inttypes.h
@@ -67,8 +68,10 @@ struct pci_vendor_info
 
 TAILQ_HEAD(,pci_vendor_info)   pci_vendors;
 
+static struct pcisel getsel(const char *str);
 static void list_bars(int fd, struct pci_conf *p);
-static void list_devs(int verbose, int bars, int caps, int errors);
+static void list_devs(const char *name, int verbose, int bars, int caps,
+int errors);
 static void list_verbose(struct pci_conf *p);
 static const char *guess_class(struct pci_conf *p);
 static const char *guess_subclass(struct pci_conf *p);
@@ -83,10 +86,10 @@ static void
 usage(void)
 {
fprintf(stderr, %s\n%s\n%s\n%s\n,
-   

svn commit: r260911 - head/sys/dev/uart

[Warner Losh]

Author: imp
Date: Mon Jan 20 17:45:36 2014
New Revision: 260911
URL: http://svnweb.freebsd.org/changeset/base/260911

Log:
  Don't lock in the generic grab just to lock again in the specific grabs.
  (I committed the wrong version of uart_core.c, which still had this).
  
  Pointy hat: imp

Modified:
  head/sys/dev/uart/uart_core.c

Modified: head/sys/dev/uart/uart_core.c
==
--- head/sys/dev/uart/uart_core.c   Mon Jan 20 15:51:02 2014
(r260910)
+++ head/sys/dev/uart/uart_core.c   Mon Jan 20 17:45:36 2014
(r260911)
@@ -629,18 +629,14 @@ void
 uart_grab(struct uart_devinfo *di)
 {
 
-   uart_lock(di-hwmtx);
if (di-sc)
UART_GRAB(di-sc);
-   uart_unlock(di-hwmtx);
 }
 
 void
 uart_ungrab(struct uart_devinfo *di)
 {
 
-   uart_lock(di-hwmtx);
if (di-sc)
UART_UNGRAB(di-sc);
-   uart_unlock(di-hwmtx);
 }
___
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: r260912 - head/sys/x86/x86

[John Baldwin]

Author: jhb
Date: Mon Jan 20 17:55:22 2014
New Revision: 260912
URL: http://svnweb.freebsd.org/changeset/base/260912

Log:
  - Only check the ivars for direct descendants.
  - A couple of whitespace fixes.

Modified:
  head/sys/x86/x86/nexus.c

Modified: head/sys/x86/x86/nexus.c
==
--- head/sys/x86/x86/nexus.cMon Jan 20 17:45:36 2014(r260911)
+++ head/sys/x86/x86/nexus.cMon Jan 20 17:55:22 2014(r260912)
@@ -368,12 +368,13 @@ nexus_alloc_resource(device_t bus, devic
int needactivate = flags  RF_ACTIVE;
 
/*
-* If this is an allocation of the default range for a given RID, and
-* we know what the resources for this device are (ie. they aren't 
maintained
-* by a child bus), then work out the start/end values.
+* If this is an allocation of the default range for a given
+* RID, and we know what the resources for this device are
+* (ie. they aren't maintained by a child bus), then work out
+* the start/end values.
 */
if ((start == 0UL)  (end == ~0UL)  (count == 1)) {
-   if (ndev == NULL)
+   if (device_get_parent(child) != bus || ndev == NULL)
return(NULL);
rle = resource_list_find(ndev-nx_resources, type, *rid);
if (rle == NULL)
@@ -492,6 +493,7 @@ static int
 nexus_release_resource(device_t bus, device_t child, int type, int rid,
   struct resource *r)
 {
+
if (rman_get_flags(r)  RF_ACTIVE) {
int error = bus_deactivate_resource(child, type, rid, r);
if (error)
___
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: r260913 - in head: include lib/libc/gen libexec/getty

[Nathan Whitehorn]

Author: nwhitehorn
Date: Mon Jan 20 18:15:06 2014
New Revision: 260913
URL: http://svnweb.freebsd.org/changeset/base/260913

Log:
  Add a new flag to /etc/ttys: onifconsole. This is equivalent to on if the
  device is an active kernel console and off otherwise. This is designed to
  allow serial-booting x86 systems to provide a login prompt on the serial line
  by default without providing one on all systems by default.
  
  Comments and suggestions by:  grehan, dteske, jilles
  MFC after:1 month

Modified:
  head/include/ttyent.h
  head/lib/libc/gen/getttyent.c
  head/libexec/getty/ttys.5

Modified: head/include/ttyent.h
==
--- head/include/ttyent.h   Mon Jan 20 17:55:22 2014(r260912)
+++ head/include/ttyent.h   Mon Jan 20 18:15:06 2014(r260913)
@@ -37,6 +37,7 @@
 
 #define_TTYS_OFF   off
 #define_TTYS_ONon
+#define_TTYS_ONIFCONSOLE onifconsole
 #define_TTYS_SECUREsecure
 #define_TTYS_INSECURE  insecure
 #define_TTYS_WINDOWwindow

Modified: head/lib/libc/gen/getttyent.c
==
--- head/lib/libc/gen/getttyent.c   Mon Jan 20 17:55:22 2014
(r260912)
+++ head/lib/libc/gen/getttyent.c   Mon Jan 20 18:15:06 2014
(r260913)
@@ -39,6 +39,9 @@ __FBSDID($FreeBSD$);
 #include ctype.h
 #include string.h
 
+#include sys/types.h
+#include sys/sysctl.h
+
 static char zapchar;
 static FILE *tf;
 static size_t lbsize;
@@ -64,6 +67,36 @@ getttynam(const char *tty)
return (t);
 }
 
+static int
+auto_tty_status(const char *ty_name)
+{
+   size_t len;
+   char *buf, *cons, *nextcons;
+
+   /* Check if this is an enabled kernel console line */
+   buf = NULL;
+   if (sysctlbyname(kern.console, NULL, len, NULL, 0) == -1)
+   return (0); /* Errors mean don't enable */
+   buf = malloc(len);
+   if (sysctlbyname(kern.console, buf, len, NULL, 0) == -1)
+   goto done;
+
+   if ((cons = strchr(buf, '/')) == NULL)
+   goto done;
+   *cons = '\0';
+   nextcons = buf;
+   while ((cons = strsep(nextcons, ,)) != NULL  strlen(cons) != 0) {
+   if (strcmp(cons, ty_name) == 0) {
+   free(buf);
+   return (TTY_ON);
+   }
+   }
+
+done:
+   free(buf);
+   return (0);
+}
+
 struct ttyent *
 getttyent(void)
 {
@@ -126,6 +159,8 @@ getttyent(void)
tty.ty_status = ~TTY_ON;
else if (scmp(_TTYS_ON))
tty.ty_status |= TTY_ON;
+   else if (scmp(_TTYS_ONIFCONSOLE))
+   tty.ty_status |= auto_tty_status(tty.ty_name);
else if (scmp(_TTYS_SECURE))
tty.ty_status |= TTY_SECURE;
else if (scmp(_TTYS_INSECURE))

Modified: head/libexec/getty/ttys.5
==
--- head/libexec/getty/ttys.5   Mon Jan 20 17:55:22 2014(r260912)
+++ head/libexec/getty/ttys.5   Mon Jan 20 18:15:06 2014(r260913)
@@ -102,8 +102,11 @@ ttys as a group.
 .Pp
 As flag values, the strings ``on'' and ``off'' specify that
 .Xr init 8
-should (should not) execute the command given in the second field,
-while ``secure'' (if ``on'' is also specified) allows users with a
+should (should not) execute the command given in the second field.
+``onifconsole'' will cause this line to be enabled if and only if it is
+an active kernel console device (it is equivalent to ``on'' in this
+case).
+The flag ``secure'' (if the console is enabled) allows users with a
 uid of 0 to login on
 this line.
 The flag ``dialin'' indicates that a tty entry describes a dialin
___
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: r260914 - head/sys/ia64/ia64

[Marcel Moolenaar]

Author: marcel
Date: Mon Jan 20 18:37:35 2014
New Revision: 260914
URL: http://svnweb.freebsd.org/changeset/base/260914

Log:
  In pmap_set_pte(), make sure to enforce ordering by inserting a memory
  fence. Under system load, the CPU has been found to change the order
  by which the stores are made visible. When the tag is made visible
  before the other TLB values, other CPUs may use the invalid TLB values
  and do bad things.
  
  While here (i.e. not a fix) don't return errors from pmap_remove_vhpt()
  to callers of pmap_remove_pte(). Those callers don't check the return
  value and as such don't do what is needed to keep a consistent state.
  More importantly, pmap_remove_vhpt() can't really have an error without
  it indicating something unintended. Using KASSERT is therefore better.
  
  PR:   182999, 183227

Modified:
  head/sys/ia64/ia64/pmap.c

Modified: head/sys/ia64/ia64/pmap.c
==
--- head/sys/ia64/ia64/pmap.c   Mon Jan 20 18:15:06 2014(r260913)
+++ head/sys/ia64/ia64/pmap.c   Mon Jan 20 18:37:35 2014(r260914)
@@ -1303,6 +1303,8 @@ pmap_set_pte(struct ia64_lpte *pte, vm_o
 
pte-itir = PAGE_SHIFT  2;
 
+   ia64_mf();
+
pte-tag = ia64_ttag(va);
 }
 
@@ -1321,8 +1323,8 @@ pmap_remove_pte(pmap_t pmap, struct ia64
 * First remove from the VHPT.
 */
error = pmap_remove_vhpt(va);
-   if (error)
-   return (error);
+   KASSERT(error == 0, (%s: pmap_remove_vhpt returned %d,
+   __func__, error));
 
pmap_invalidate_page(va);
 
___
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: r260915 - head/sys/vm

[Gleb Smirnoff]

Author: glebius
Date: Mon Jan 20 18:47:56 2014
New Revision: 260915
URL: http://svnweb.freebsd.org/changeset/base/260915

Log:
  ANSIfy declarations.
  
  Ok'ed by: alc

Modified:
  head/sys/vm/vnode_pager.c

Modified: head/sys/vm/vnode_pager.c
==
--- head/sys/vm/vnode_pager.c   Mon Jan 20 18:37:35 2014(r260914)
+++ head/sys/vm/vnode_pager.c   Mon Jan 20 18:47:56 2014(r260915)
@@ -244,8 +244,7 @@ retry:
  * The object must be locked.
  */
 static void
-vnode_pager_dealloc(object)
-   vm_object_t object;
+vnode_pager_dealloc(vm_object_t object)
 {
struct vnode *vp;
int refs;
@@ -280,11 +279,8 @@ vnode_pager_dealloc(object)
 }
 
 static boolean_t
-vnode_pager_haspage(object, pindex, before, after)
-   vm_object_t object;
-   vm_pindex_t pindex;
-   int *before;
-   int *after;
+vnode_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before,
+int *after)
 {
struct vnode *vp = object-handle;
daddr_t bn;
@@ -363,9 +359,7 @@ vnode_pager_haspage(object, pindex, befo
  * operation (possibly at object termination time), so we must be careful.
  */
 void
-vnode_pager_setsize(vp, nsize)
-   struct vnode *vp;
-   vm_ooffset_t nsize;
+vnode_pager_setsize(struct vnode *vp, vm_ooffset_t nsize)
 {
vm_object_t object;
vm_page_t m;
@@ -490,9 +484,7 @@ vnode_pager_addr(struct vnode *vp, vm_oo
  * small block filesystem vnode pager input
  */
 static int
-vnode_pager_input_smlfs(object, m)
-   vm_object_t object;
-   vm_page_t m;
+vnode_pager_input_smlfs(vm_object_t object, vm_page_t m)
 {
struct vnode *vp;
struct bufobj *bo;
@@ -584,9 +576,7 @@ vnode_pager_input_smlfs(object, m)
  * old style vnode pager input routine
  */
 static int
-vnode_pager_input_old(object, m)
-   vm_object_t object;
-   vm_page_t m;
+vnode_pager_input_old(vm_object_t object, vm_page_t m)
 {
struct uio auio;
struct iovec aiov;
@@ -659,11 +649,7 @@ vnode_pager_input_old(object, m)
  * backing vp's VOP_GETPAGES.
  */
 static int
-vnode_pager_getpages(object, m, count, reqpage)
-   vm_object_t object;
-   vm_page_t *m;
-   int count;
-   int reqpage;
+vnode_pager_getpages(vm_object_t object, vm_page_t *m, int count, int reqpage)
 {
int rtval;
struct vnode *vp;
@@ -683,11 +669,8 @@ vnode_pager_getpages(object, m, count, r
  * own vnodes if they fail to implement VOP_GETPAGES.
  */
 int
-vnode_pager_generic_getpages(vp, m, bytecount, reqpage)
-   struct vnode *vp;
-   vm_page_t *m;
-   int bytecount;
-   int reqpage;
+vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, int bytecount,
+int reqpage)
 {
vm_object_t object;
vm_offset_t kva;
@@ -1024,12 +1007,8 @@ vnode_pager_generic_getpages(vp, m, byte
  * backing vp's VOP_PUTPAGES.
  */
 static void
-vnode_pager_putpages(object, m, count, sync, rtvals)
-   vm_object_t object;
-   vm_page_t *m;
-   int count;
-   boolean_t sync;
-   int *rtvals;
+vnode_pager_putpages(vm_object_t object, vm_page_t *m, int count,
+boolean_t sync, int *rtvals)
 {
int rtval;
struct vnode *vp;
___
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: r260918 - in stable/10/contrib/gcc: . cp doc

[Pedro F. Giffuni]

Author: pfg
Date: Mon Jan 20 19:37:38 2014
New Revision: 260918
URL: http://svnweb.freebsd.org/changeset/base/260918

Log:
  MFC   r260014, r260099:
  
  gcc: Add support for label attributes and unavailable attribute.
  
  Apple GCC has extensions to support for both label attributes and
  an unavailable attribute. These are critical for objc but are
  also useful in regular C/C++.
  
  Obtained from:Apple GCC 4.2 - 5531

Added:
  stable/10/contrib/gcc/ChangeLog.apple
 - copied unchanged from r260014, head/contrib/gcc/ChangeLog.apple
  stable/10/contrib/gcc/cp/ChangeLog.apple
 - copied unchanged from r260014, head/contrib/gcc/cp/ChangeLog.apple
Modified:
  stable/10/contrib/gcc/c-common.c
  stable/10/contrib/gcc/c-decl.c
  stable/10/contrib/gcc/c-parser.c
  stable/10/contrib/gcc/c-tree.h
  stable/10/contrib/gcc/c-typeck.c
  stable/10/contrib/gcc/cp/cp-gimplify.c
  stable/10/contrib/gcc/cp/cp-tree.def
  stable/10/contrib/gcc/cp/cp-tree.h
  stable/10/contrib/gcc/cp/decl.c
  stable/10/contrib/gcc/cp/dump.c
  stable/10/contrib/gcc/cp/init.c
  stable/10/contrib/gcc/cp/parser.c
  stable/10/contrib/gcc/cp/pt.c
  stable/10/contrib/gcc/cp/semantics.c
  stable/10/contrib/gcc/doc/extend.texi
  stable/10/contrib/gcc/dwarf2out.c
  stable/10/contrib/gcc/emit-rtl.c
  stable/10/contrib/gcc/final.c
  stable/10/contrib/gcc/print-rtl.c
  stable/10/contrib/gcc/print-tree.c
  stable/10/contrib/gcc/rtl.def
  stable/10/contrib/gcc/rtl.h
  stable/10/contrib/gcc/stmt.c
  stable/10/contrib/gcc/toplev.c
  stable/10/contrib/gcc/toplev.h
  stable/10/contrib/gcc/tree-cfg.c
  stable/10/contrib/gcc/tree.h
Directory Properties:
  stable/10/   (props changed)

Copied: stable/10/contrib/gcc/ChangeLog.apple (from r260014, 
head/contrib/gcc/ChangeLog.apple)
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ stable/10/contrib/gcc/ChangeLog.apple   Mon Jan 20 19:37:38 2014
(r260918, copy of r260014, head/contrib/gcc/ChangeLog.apple)
@@ -0,0 +1,51 @@
+006-02-15   Fariborz Jahanian fjahan...@apple.com
+
+   Radar 4445586
+   * c-common.def (DO_STMT): Takes an extra argument.
+
+/* APPLE LOCAL merge marger */
+/* Stuff under is in fsf mainline, but not in the 4.2 branch */
+
+2007-08-02  Geoffrey Keating  geo...@apple.com
+
+   Radar 3274130, 5295549
+   * c-parser.c (c_parser_while_statement): Handle attributes.
+   (c_parser_do_statement): Handle attributes.
+   (c_parser_for_statement): Handle attributes.
+   * c-common.c (handle_unused_attribute): Warn if a statement
+   is marked as unused.
+   * c-tree.h (c_finish_loop): Add extra parameter.
+   * c-typeck.c (c_finish_loop): Handle attributes.
+   * doc/extend.texi (Attribute Syntax): Document statement attributes.
+   (Label Attributes): Explain how they apply to statements.
+   * tree-cfg.c (cleanup_dead_labels): Preserve labels with
+   user-specified alignment or attributes.
+   * stmt.c (expand_label): Update and correct documentation.
+
+   * c-common.c (handle_aligned_attribute): Handle LABEL_DECL.
+   * rtl.def (CODE_LABEL): Add 8th operand.
+   * rtl.h (LABEL_ALIGN_LOG): New.
+   (LABEL_MAX_SKIP): New.
+   (SET_LABEL_ALIGN): New.
+   * emit-rtl.c (gen_label_rtx): Adjust.
+   * print-rtl.c (print_rtx): Print LABEL_ALIGN_LOG.
+   * stmt.c (label_rtx): Set CODE_LABEL's alignment from DECL_ALIGN.
+   (expand_label): Update documentation.
+   * final.c (struct label_alignment): Delete.
+   (label_align): Delete.
+   (min_labelno): Delete.
+   (max_labelno): Delete.
+   (LABEL_TO_ALIGNMENT): Delete.
+   (LABEL_TO_MAX_SKIP): Delete.
+   (label_to_alignment): Adjust for LABEL_ALIGN_LOG.
+   (align_fuzz): Likewise.
+   (compute_alignments): Likewise.
+   (shorten_branches): Remove code to set up label_align.
+   Adjust for LABEL_ALIGN_LOG.
+   (final_scan_insn): Adjust for LABEL_ALIGN_LOG.
+   * doc/extend.texi (C Extensions): Add 'Label Attributes' to menu.
+   (Attribute Syntax): Move label content to Label Attributes.
+   (Function Attributes): Mention label attributes.
+   (Variable Attributes): Mention label attributes.
+   (Type Attributes): Mention label attributes.
+   (Label Attributes): New.

Modified: stable/10/contrib/gcc/c-common.c
==
--- stable/10/contrib/gcc/c-common.cMon Jan 20 18:59:07 2014
(r260917)
+++ stable/10/contrib/gcc/c-common.cMon Jan 20 19:37:38 2014
(r260918)
@@ -541,6 +541,9 @@ static tree handle_pure_attribute (tree 
 static tree handle_novops_attribute (tree *, tree, tree, int, bool *);
 static tree handle_deprecated_attribute (tree *, tree, tree, int,
 bool *);
+/* APPLE LOCAL begin unavailable attribute (Radar 2809697) --ilr */

svn commit: r260919 - in stable/9/contrib/gcc: . cp doc

[Pedro F. Giffuni]

Author: pfg
Date: Mon Jan 20 19:38:16 2014
New Revision: 260919
URL: http://svnweb.freebsd.org/changeset/base/260919

Log:
  MFC   r260014, r260099:
  
  gcc: Add support for label attributes and unavailable attribute.
  
  Apple GCC has extensions to support for both label attributes and
  an unavailable attribute. These are critical for objc but are
  also useful in regular C/C++.
  
  Obtained from:Apple GCC 4.2 - 5531

Added:
  stable/9/contrib/gcc/ChangeLog.apple
 - copied unchanged from r260014, head/contrib/gcc/ChangeLog.apple
  stable/9/contrib/gcc/cp/ChangeLog.apple
 - copied unchanged from r260014, head/contrib/gcc/cp/ChangeLog.apple
Modified:
  stable/9/contrib/gcc/c-common.c
  stable/9/contrib/gcc/c-decl.c
  stable/9/contrib/gcc/c-parser.c
  stable/9/contrib/gcc/c-tree.h
  stable/9/contrib/gcc/c-typeck.c
  stable/9/contrib/gcc/cp/cp-gimplify.c
  stable/9/contrib/gcc/cp/cp-tree.def
  stable/9/contrib/gcc/cp/cp-tree.h
  stable/9/contrib/gcc/cp/decl.c
  stable/9/contrib/gcc/cp/dump.c
  stable/9/contrib/gcc/cp/init.c
  stable/9/contrib/gcc/cp/parser.c
  stable/9/contrib/gcc/cp/pt.c
  stable/9/contrib/gcc/cp/semantics.c
  stable/9/contrib/gcc/doc/extend.texi
  stable/9/contrib/gcc/dwarf2out.c
  stable/9/contrib/gcc/emit-rtl.c
  stable/9/contrib/gcc/final.c
  stable/9/contrib/gcc/print-rtl.c
  stable/9/contrib/gcc/print-tree.c
  stable/9/contrib/gcc/rtl.def
  stable/9/contrib/gcc/rtl.h
  stable/9/contrib/gcc/stmt.c
  stable/9/contrib/gcc/toplev.c
  stable/9/contrib/gcc/toplev.h
  stable/9/contrib/gcc/tree-cfg.c
  stable/9/contrib/gcc/tree.h
Directory Properties:
  stable/9/   (props changed)
  stable/9/contrib/gcc/   (props changed)

Copied: stable/9/contrib/gcc/ChangeLog.apple (from r260014, 
head/contrib/gcc/ChangeLog.apple)
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ stable/9/contrib/gcc/ChangeLog.appleMon Jan 20 19:38:16 2014
(r260919, copy of r260014, head/contrib/gcc/ChangeLog.apple)
@@ -0,0 +1,51 @@
+006-02-15   Fariborz Jahanian fjahan...@apple.com
+
+   Radar 4445586
+   * c-common.def (DO_STMT): Takes an extra argument.
+
+/* APPLE LOCAL merge marger */
+/* Stuff under is in fsf mainline, but not in the 4.2 branch */
+
+2007-08-02  Geoffrey Keating  geo...@apple.com
+
+   Radar 3274130, 5295549
+   * c-parser.c (c_parser_while_statement): Handle attributes.
+   (c_parser_do_statement): Handle attributes.
+   (c_parser_for_statement): Handle attributes.
+   * c-common.c (handle_unused_attribute): Warn if a statement
+   is marked as unused.
+   * c-tree.h (c_finish_loop): Add extra parameter.
+   * c-typeck.c (c_finish_loop): Handle attributes.
+   * doc/extend.texi (Attribute Syntax): Document statement attributes.
+   (Label Attributes): Explain how they apply to statements.
+   * tree-cfg.c (cleanup_dead_labels): Preserve labels with
+   user-specified alignment or attributes.
+   * stmt.c (expand_label): Update and correct documentation.
+
+   * c-common.c (handle_aligned_attribute): Handle LABEL_DECL.
+   * rtl.def (CODE_LABEL): Add 8th operand.
+   * rtl.h (LABEL_ALIGN_LOG): New.
+   (LABEL_MAX_SKIP): New.
+   (SET_LABEL_ALIGN): New.
+   * emit-rtl.c (gen_label_rtx): Adjust.
+   * print-rtl.c (print_rtx): Print LABEL_ALIGN_LOG.
+   * stmt.c (label_rtx): Set CODE_LABEL's alignment from DECL_ALIGN.
+   (expand_label): Update documentation.
+   * final.c (struct label_alignment): Delete.
+   (label_align): Delete.
+   (min_labelno): Delete.
+   (max_labelno): Delete.
+   (LABEL_TO_ALIGNMENT): Delete.
+   (LABEL_TO_MAX_SKIP): Delete.
+   (label_to_alignment): Adjust for LABEL_ALIGN_LOG.
+   (align_fuzz): Likewise.
+   (compute_alignments): Likewise.
+   (shorten_branches): Remove code to set up label_align.
+   Adjust for LABEL_ALIGN_LOG.
+   (final_scan_insn): Adjust for LABEL_ALIGN_LOG.
+   * doc/extend.texi (C Extensions): Add 'Label Attributes' to menu.
+   (Attribute Syntax): Move label content to Label Attributes.
+   (Function Attributes): Mention label attributes.
+   (Variable Attributes): Mention label attributes.
+   (Type Attributes): Mention label attributes.
+   (Label Attributes): New.

Modified: stable/9/contrib/gcc/c-common.c
==
--- stable/9/contrib/gcc/c-common.c Mon Jan 20 19:37:38 2014
(r260918)
+++ stable/9/contrib/gcc/c-common.c Mon Jan 20 19:38:16 2014
(r260919)
@@ -541,6 +541,9 @@ static tree handle_pure_attribute (tree 
 static tree handle_novops_attribute (tree *, tree, tree, int, bool *);
 static tree handle_deprecated_attribute (tree *, tree, tree, int,
 bool *);
+/* APPLE LOCAL begin unavailable attribute (Radar 2809697) 

svn commit: r260921 - head/sys/arm/conf

[Warner Losh]

Author: imp
Date: Mon Jan 20 19:57:30 2014
New Revision: 260921
URL: http://svnweb.freebsd.org/changeset/base/260921

Log:
  We need nand now that the boards reference it.

Modified:
  head/sys/arm/conf/NOTES

Modified: head/sys/arm/conf/NOTES
==
--- head/sys/arm/conf/NOTES Mon Jan 20 19:38:44 2014(r260920)
+++ head/sys/arm/conf/NOTES Mon Jan 20 19:57:30 2014(r260921)
@@ -60,6 +60,7 @@ deviceat91_board_sam9g20ek
 device at91_board_sam9x25ek
 device at91_board_tsc4370
 device at91rm9200
+device nand
 device board_ln2410sbc
 
 nooptions  SMP
___
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: r260922 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 20:06:13 2014
New Revision: 260922
URL: http://svnweb.freebsd.org/changeset/base/260922

Log:
  Sync with (local) changes against releng/10.0/release/doc/
  that were needed to fix 10.0-RELEASE release notes.
  
  This corresponds to r43586 through r43593 of the doc/
  repository.  There are no corresponding changes to the src/
  repository tracking these.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
19:57:30 2014(r260921)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
20:06:13 2014(r260922)
@@ -27,6 +27,7 @@
 year2011/year
 year2012/year
 year2013/year
+year2014/year
 holder role=mailto:d...@freebsd.org;The os; Documentation 
Project/holder
   /copyright
 
@@ -128,11 +129,6 @@
 para arch=amd64 revision=254466The maximum amount of memory the os; 
kernel
   can address has been increased from 1TB to 4TB./para
 
-paraA new man.cpuset.2; API has been added
-  for thread to CPU binding and CPU resource grouping and
-  assignment.  The man.cpuset.1; userland utility has been added
-  to allow manipulation of processor sets./para
-
 para role=mergedThe man.ddb.4; kernel debugger now has an output 
capture
   facility.  Input and output from man.ddb.4; can now be captured
   to a memory buffer for later inspection using man.sysctl.8; or
@@ -146,37 +142,6 @@
   utility.  More details can be found in the man.ddb.4; manual
   page./para
 
-para role=mergedThe kernel now supports a new textdump format of kernel
-  dumps.  A textdump provides higher-level information via
-  mechanically generated/extracted debugging output, rather than a
-  simple memory dump.  This facility can be used to generate brief
-  kernel bug reports that are rich in debugging information, but
-  are not dependent on kernel symbol tables or precisely
-  synchronized source code.  More information can be found in the
-  man.textdump.4; manual page./para
-
-paraKernel support for M:N threading has been removed.  While
-  the KSE (Kernel Scheduled Entities) project was quite successful
-  in bringing threading to FreeBSD, the M:N approach taken by the
-  KSE library was never developed to its full potential.
-  Backwards compatibility for applications using KSE threading
-  will be provided via man.libmap.conf.5; for dynamically linked
-  binaries.  The os; Project greatly appreciates the work of
-  a.julian;, a.deischen;, and a.davidxu; on KSE support./para
-
-paraThe os; kernel now exports information about certain kernel
-  features via the varnamekern.features/varname sysctl tree.
-  The man.feature.present.3; library call provides a convenient
-  interface for user applications to test the presence of
-  features./para
-
-para arch=amd64The os; kernel now has support for large
-  memory page mappings (quotesuperpages/quote)./para
-
-para arch=amd64,i386,ia64,powerpc role=mergedThe ULE
-  scheduler is now the default process scheduler
-  in filenameGENERIC/filename kernels./para
-
 para arch=amd64,i386 revision=240135Support was added for
   the new Intel on-CPU Bull Mountain random number
   generator, found on IvyBridge and supposedly later CPUs,
@@ -246,6 +211,7 @@ hv_vmbus_load=YES/programlisting  Al
 
 /sect3
 
+!--
 sect3 xml:id=boot
   titleBoot Loader Changes/title
 
@@ -262,19 +228,11 @@ hv_vmbus_load=YES/programlisting  Al
 partition if required./para
 
 /sect3
+--
 
 sect3 xml:id=proc
   titleHardware Support/title
 
-  para role=mergedThe man.cmx.4; driver, a driver for Omnikey CardMan 
4040
-PCMCIA smartcard readers, has been added./para
-
-  paraThe man.syscons.4; driver now supports Colemak keyboard 
layout./para
-
-  para role=mergedThe man.uslcom.4; driver, a driver for Silicon
-Laboratories CP2101/CP2102-based USB serial adapters, has been
-imported from OpenBSD./para
-
   sect4 xml:id=mm
titleMultimedia Support/title
 
@@ -287,29 +245,8 @@ hv_vmbus_load=YES/programlisting  Al
   sect4 xml:id=net-if
titleNetwork Interface Support/title
 
-   paraThe man.ale.4; driver has been added to provide support
- for Atheros AR8121/AR8113/AR8114 Gigabit/Fast Ethernet 
controllers./para
-
-   paraThe man.em.4; driver has been split into two drivers
- with some common parts.  The man.em.4; driver will continue
- to support adapters up to the 82575, as well as new
- client/desktop adapters.  A new man.igb.4; driver
- will support new server adapters./para
-
-  

svn commit: r260923 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 20:28:04 2014
New Revision: 260923
URL: http://svnweb.freebsd.org/changeset/base/260923

Log:
  Fix formatting, indentation, line length in preparation of
  upcoming changes to this file.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
20:06:13 2014(r260922)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
20:28:04 2014(r260923)
@@ -1,12 +1,11 @@
 ?xml version=1.0 encoding=iso-8859-1?
 !DOCTYPE article PUBLIC -//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN
-../../../share/xml/freebsd50.dtd [
+   ../../../share/xml/freebsd50.dtd [
 !ENTITY % release PUBLIC -//FreeBSD//ENTITIES Release Specification//EN 
release.ent
  %release;
 ]
 article xmlns=http://docbook.org/ns/docbook; 
xmlns:xlink=http://www.w3.org/1999/xlink; version=5.0
-infotitleos; release.current; Release Notes/title
-  
+  infotitleos; release.current; Release Notes/title
 
   authororgnameThe os; Project/orgname/author
 
@@ -28,7 +27,8 @@
 year2012/year
 year2013/year
 year2014/year
-holder role=mailto:d...@freebsd.org;The os; Documentation 
Project/holder
+holder role=mailto:d...@freebsd.org;The os; Documentation
+  Project/holder
   /copyright
 
   legalnotice xml:id=trademarks role=trademarks
@@ -41,13 +41,13 @@
   /legalnotice
 
   abstract
-paraThe release notes for os; release.current; contain a summary
-  of the changes made to the os; base system on the
-  release.branch; development line.
-  This document lists applicable security advisories that were issued since
-  the last release, as well as significant changes to the os;
-  kernel and userland.
-  Some brief remarks on upgrading are also presented./para
+paraThe release notes for os; release.current; contain
+  a summary of the changes made to the os; base system on the
+  release.branch; development line.  This document lists
+  applicable security advisories that were issued since the last
+  release, as well as significant changes to the os; kernel and
+  userland.  Some brief remarks on upgrading are also
+  presented./para
   /abstract
 /info
 
@@ -55,30 +55,32 @@
   titleIntroduction/title
 
   paraThis document contains the release notes for os;
-release.current;.  It
-describes recently added, changed, or deleted features of os;.
-It also provides some notes on upgrading
-from previous versions of os;./para
-
-  para releasetype=currentThe release.type; distribution to which these 
release notes
-apply represents the latest point along the release.branch; development
-branch since release.branch; was created.  Information regarding 
pre-built, binary
-release.type; distributions along this branch
-can be found at uri xlink:href=release.url;release.url;/uri./para
-
-  para releasetype=snapshotThe release.type; distribution to which these 
release notes
-apply represents a point along the release.branch; development
-branch between release.prev; and the future release.next;.
-Information regarding
-pre-built, binary release.type; distributions along this branch
-can be found at uri xlink:href=release.url;release.url;/uri./para
-
-  para releasetype=releaseThis distribution of os; release.current; is a
-release.type; distribution.  It can be found at uri 
xlink:href=release.url;release.url;/uri or any of its mirrors.  More
-information on obtaining this (or other) release.type;
-distributions of os; can be found in the link 
xlink:href=url.books.handbook;/mirrors.htmlquoteObtaining
-os;/quote appendix/link to the link 
xlink:href=url.books.handbook;/os;
-Handbook/link./para
+release.current;.  It describes recently added, changed, or
+deleted features of os;.  It also provides some notes on
+upgrading from previous versions of os;./para
+
+  para releasetype=currentThe release.type; distribution to which
+these release notes apply represents the latest point along the
+release.branch; development branch since release.branch; was
+created.  Information regarding pre-built, binary release.type;
+distributions along this branch can be found at uri
+  xlink:href=release.url;release.url;/uri./para
+
+  para releasetype=snapshotThe release.type; distribution to
+which these release notes apply represents a point along the
+release.branch; development branch between release.prev; and the
+future release.next;.  Information regarding pre-built, binary
+release.type; distributions along this branch can be found at
+uri xlink:href=release.url;release.url;/uri./para
+
+  para releasetype=releaseThis distribution of os;
+  

svn commit: r260924 - stable/10/usr.bin/script

[Mikolaj Golub]

Author: trociny
Date: Mon Jan 20 20:33:40 2014
New Revision: 260924
URL: http://svnweb.freebsd.org/changeset/base/260924

Log:
  MFC r260833:
  
  Bring back r226403, the fix for bin/161526, which was (accidentally?)
  reverted in r238896.
  
  PR:   bin/161526
  Reported by:  Karli.Sjoberg slu.se

Modified:
  stable/10/usr.bin/script/script.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/script/script.c
==
--- stable/10/usr.bin/script/script.c   Mon Jan 20 20:28:04 2014
(r260923)
+++ stable/10/usr.bin/script/script.c   Mon Jan 20 20:33:40 2014
(r260924)
@@ -235,12 +235,15 @@ main(int argc, char *argv[])
FD_SET(master, rfd);
if (readstdin)
FD_SET(STDIN_FILENO, rfd);
-   if ((!readstdin  ttyflg) || flushtime  0) {
-   tv.tv_sec = !readstdin  ttyflg ? 1 :
-   flushtime - (tvec - start);
+   if (!readstdin  ttyflg) {
+   tv.tv_sec = 1;
tv.tv_usec = 0;
tvp = tv;
readstdin = 1;
+   } else if (flushtime  0) {
+   tv.tv_sec = flushtime - (tvec - start);
+   tv.tv_usec = 0;
+   tvp = tv;
} else {
tvp = 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: r260925 - stable/9/usr.bin/script

[Mikolaj Golub]

Author: trociny
Date: Mon Jan 20 20:34:31 2014
New Revision: 260925
URL: http://svnweb.freebsd.org/changeset/base/260925

Log:
  MFC r260833:
  
  Bring back r226403, the fix for bin/161526, which was (accidentally?)
  reverted in r238896.
  
  PR:   bin/161526
  Reported by:  Karli.Sjoberg slu.se

Modified:
  stable/9/usr.bin/script/script.c
Directory Properties:
  stable/9/usr.bin/script/   (props changed)

Modified: stable/9/usr.bin/script/script.c
==
--- stable/9/usr.bin/script/script.cMon Jan 20 20:33:40 2014
(r260924)
+++ stable/9/usr.bin/script/script.cMon Jan 20 20:34:31 2014
(r260925)
@@ -235,12 +235,15 @@ main(int argc, char *argv[])
FD_SET(master, rfd);
if (readstdin)
FD_SET(STDIN_FILENO, rfd);
-   if ((!readstdin  ttyflg) || flushtime  0) {
-   tv.tv_sec = !readstdin  ttyflg ? 1 :
-   flushtime - (tvec - start);
+   if (!readstdin  ttyflg) {
+   tv.tv_sec = 1;
tv.tv_usec = 0;
tvp = tv;
readstdin = 1;
+   } else if (flushtime  0) {
+   tv.tv_sec = flushtime - (tvec - start);
+   tv.tv_usec = 0;
+   tvp = tv;
} else {
tvp = 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

Re: svn commit: r260898 - head/sys/kern

[John Baldwin]

On Sunday 19 January 2014 18:18:03 Rui Paulo wrote:
 On 19 Jan 2014, at 17:59, Neel Natu n...@freebsd.org wrote:
  Author: neel
  Date: Mon Jan 20 01:59:35 2014
  New Revision: 260898
  URL: http://svnweb.freebsd.org/changeset/base/260898
  
  Log:
   Bump up WITNESS_COUNT from 1024 to 1536 so there are sufficient entries
   for
   WITNESS to actually work.
 
 This value should be automatically tuned...

How do you propose to do so?  This is the count of locks initialized before 
witness' own SYSINIT is executed and the array it sizes is allocated 
statically at compile time.  This used to not be a static array, but an
intrusive list embedded in locks themselves, but we decided to shave a
pointer off of each lock that was only used for that and to use a statically 
sized table instead.

-- 
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: r260926 - in head: sys/dev/pci sys/sys usr.sbin/pciconf

[John Baldwin]

Author: jhb
Date: Mon Jan 20 20:56:09 2014
New Revision: 260926
URL: http://svnweb.freebsd.org/changeset/base/260926

Log:
  Add support for displaying VPD for PCI devices via pciconf.
  - Store the length of each read-only VPD value since not all values are
guaranteed to be ASCII values (though most are).
  - Add a new pciio ioctl to fetch VPD for a single PCI device.  The values
are returned as a list of variable length records, one for the device
name and each keyword.
  - Add a new -V flag to pciconf's list mode which displays VPD data for
each device.
  
  MFC after:1 week

Modified:
  head/sys/dev/pci/pci.c
  head/sys/dev/pci/pci_user.c
  head/sys/dev/pci/pcivar.h
  head/sys/sys/pciio.h
  head/usr.sbin/pciconf/pciconf.8
  head/usr.sbin/pciconf/pciconf.c

Modified: head/sys/dev/pci/pci.c
==
--- head/sys/dev/pci/pci.c  Mon Jan 20 20:34:31 2014(r260925)
+++ head/sys/dev/pci/pci.c  Mon Jan 20 20:56:09 2014(r260926)
@@ -985,7 +985,7 @@ pci_read_vpd(device_t pcib, pcicfgregs *
state = -2;
break;
}
-   dflen = byte2;
+   cfg-vpd.vpd_ros[off].len = dflen = byte2;
if (dflen == 0 
strncmp(cfg-vpd.vpd_ros[off].keyword, RV,
2) == 0) {
@@ -1179,6 +1179,17 @@ pci_get_vpd_readonly_method(device_t dev
return (ENXIO);
 }
 
+struct pcicfg_vpd *
+pci_fetch_vpd_list(device_t dev)
+{
+   struct pci_devinfo *dinfo = device_get_ivars(dev);
+   pcicfgregs *cfg = dinfo-cfg;
+
+   if (!cfg-vpd.vpd_cached  cfg-vpd.vpd_reg != 0)
+   pci_read_vpd(device_get_parent(device_get_parent(dev)), cfg);
+   return (cfg-vpd);
+}
+
 /*
  * Find the requested HyperTransport capability and return the offset
  * in configuration space via the pointer provided.  The function

Modified: head/sys/dev/pci/pci_user.c
==
--- head/sys/dev/pci/pci_user.c Mon Jan 20 20:34:31 2014(r260925)
+++ head/sys/dev/pci/pci_user.c Mon Jan 20 20:56:09 2014(r260926)
@@ -407,6 +407,89 @@ pci_conf_match_old32(struct pci_match_co
 #endif /* PRE7_COMPAT */
 
 static int
+pci_list_vpd(device_t dev, struct pci_list_vpd_io *lvio)
+{
+   struct pci_vpd_element vpd_element, *vpd_user;
+   struct pcicfg_vpd *vpd;
+   size_t len;
+   int error, i;
+
+   vpd = pci_fetch_vpd_list(dev);
+   if (vpd-vpd_reg == 0 || vpd-vpd_ident == NULL)
+   return (ENXIO);
+
+   /*
+* Calculate the amount of space needed in the data buffer.  An
+* identifier element is always present followed by the read-only
+* and read-write keywords.
+*/
+   len = sizeof(struct pci_vpd_element) + strlen(vpd-vpd_ident);
+   for (i = 0; i  vpd-vpd_rocnt; i++)
+   len += sizeof(struct pci_vpd_element) + vpd-vpd_ros[i].len;
+   for (i = 0; i  vpd-vpd_wcnt; i++)
+   len += sizeof(struct pci_vpd_element) + vpd-vpd_w[i].len;
+
+   if (lvio-plvi_len == 0) {
+   lvio-plvi_len = len;
+   return (0);
+   }
+   if (lvio-plvi_len  len) {
+   lvio-plvi_len = len;
+   return (ENOMEM);
+   }
+
+   /*
+* Copyout the identifier string followed by each keyword and
+* value.
+*/
+   vpd_user = lvio-plvi_data;
+   vpd_element.pve_keyword[0] = '\0';
+   vpd_element.pve_keyword[1] = '\0';
+   vpd_element.pve_flags = PVE_FLAG_IDENT;
+   vpd_element.pve_datalen = strlen(vpd-vpd_ident);
+   error = copyout(vpd_element, vpd_user, sizeof(vpd_element));
+   if (error)
+   return (error);
+   error = copyout(vpd-vpd_ident, vpd_user-pve_data,
+   strlen(vpd-vpd_ident));
+   if (error)
+   return (error);
+   vpd_user = PVE_NEXT(vpd_user);
+   vpd_element.pve_flags = 0;
+   for (i = 0; i  vpd-vpd_rocnt; i++) {
+   vpd_element.pve_keyword[0] = vpd-vpd_ros[i].keyword[0];
+   vpd_element.pve_keyword[1] = vpd-vpd_ros[i].keyword[1];
+   vpd_element.pve_datalen = vpd-vpd_ros[i].len;
+   error = copyout(vpd_element, vpd_user, sizeof(vpd_element));
+   if (error)
+   return (error);
+   error = copyout(vpd-vpd_ros[i].value, vpd_user-pve_data,
+   vpd-vpd_ros[i].len);
+   if (error)
+   return (error);
+   vpd_user = PVE_NEXT(vpd_user);
+   }
+   vpd_element.pve_flags = PVE_FLAG_RW;
+   for (i = 0; i  vpd-vpd_wcnt; i++) {
+   vpd_element.pve_keyword[0] = vpd-vpd_w[i].keyword[0];
+   vpd_element.pve_keyword[1] = vpd-vpd_w[i].keyword[1];
+ 

Re: svn commit: r260898 - head/sys/kern

[Rui Paulo]

On 20 Jan 2014, at 08:32, John Baldwin j...@freebsd.org wrote:

 On Sunday 19 January 2014 18:18:03 Rui Paulo wrote:
 On 19 Jan 2014, at 17:59, Neel Natu n...@freebsd.org wrote:
 Author: neel
 Date: Mon Jan 20 01:59:35 2014
 New Revision: 260898
 URL: http://svnweb.freebsd.org/changeset/base/260898
 
 Log:
 Bump up WITNESS_COUNT from 1024 to 1536 so there are sufficient entries
 for
 WITNESS to actually work.
 
 This value should be automatically tuned...
 
 How do you propose to do so?  This is the count of locks initialized before 
 witness' own SYSINIT is executed and the array it sizes is allocated 
 statically at compile time.

Witness is never used (witness_cold) until witness_initialise() is called, 
right?

  This used to not be a static array, but an
 intrusive list embedded in locks themselves, but we decided to shave a
 pointer off of each lock that was only used for that and to use a statically 
 sized table instead.

Why don’t we start with a static value (say 1024) and then reinitialise and 
copy array if it doesn’t fit instead of crashing the kernel?

--
Rui Paulo



___
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: r260927 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 21:49:59 2014
New Revision: 260927
URL: http://svnweb.freebsd.org/changeset/base/260927

Log:
  Trim copyright years.
  Add missing punctuation.
  Use quote/quote in place of literal quotes.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
20:56:09 2014(r260926)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
21:49:59 2014(r260927)
@@ -12,20 +12,6 @@
   pubdate$FreeBSD$/pubdate
 
   copyright
-year2000/year
-year2001/year
-year2002/year
-year2003/year
-year2004/year
-year2005/year
-year2006/year
-year2007/year
-year2008/year
-year2009/year
-year2010/year
-year2011/year
-year2012/year
-year2013/year
 year2014/year
 holder role=mailto:d...@freebsd.org;The os; Documentation
   Project/holder
@@ -365,7 +351,7 @@ hv_vmbus_load=YES/programlisting
   titleFile Systems/title
 
   para revision=255570A new kernel-based iSCSI target and
-   initiator has been added/para
+   initiator has been added./para
 
   para revision=243246UFS filesystems can now be enlarged with
man.growfs.8; while mounted read-write. This is especially
@@ -374,7 +360,7 @@ hv_vmbus_load=YES/programlisting
 
   para revision=241519A state of the art FUSE implementation
is now part of the base system. It allows the use of nearly
-   all fusefs file systems/para
+   all fusefs file systems./para
 
   sect4 xml:id=fs-zfs
titleZFS/title
@@ -393,7 +379,7 @@ hv_vmbus_load=YES/programlisting
para revision=246586Support for the high performance LZ4
  compression algorithm has been added to ZFS. LZ4 is usually
  faster and can achieve a higher compression ratio than LZJB,
- the default compression algorithm/para
+ the default compression algorithm./para
 
para revision=252140Support for L2ARC compression has been
  added to ZFS./para
@@ -469,7 +455,7 @@ hv_vmbus_load=YES/programlisting
   2.5.37/para
 
 para revision=250699man.make.1; has been replaced with the
-  Portable BSD make tool (bmake) from NetBSD./para
+  quotePortable/quote BSD make tool (bmake) from NetBSD./para
 
 para revision=243023Support for usernames up to 32
   characters./para
@@ -608,7 +594,7 @@ hv_vmbus_load=YES/programlisting
 
 para revision=251794applicationCVS/application has been
   removed from the base system, but is still available from
-  ports/para
+  ports./para
 
 para revision=251886Subversion has been imported into the base
   system and is installed as applicationsvnlite/application.
@@ -671,7 +657,7 @@ hv_vmbus_load=YES/programlisting
   pkg_info, pkg_updating, and pkg_version utilities have been
   removed.  man.pkg.7; must now be used to install binary
   packages.  man.pkg.7; is the next generation os; package
-  manager, also referred to as pkgng./para
+  manager, also referred to as quotepkgng/quote./para
   /sect2
 
   sect2 xml:id=releng
___
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: r260932 - stable/10/contrib/gcc/cp

[Pedro F. Giffuni]

Author: pfg
Date: Mon Jan 20 21:50:31 2014
New Revision: 260932
URL: http://svnweb.freebsd.org/changeset/base/260932

Log:
  MFC   r260332;
  gcc: backport some fixes from llvm-gcc
  
  llvm-gcc backported some patches from gcc trunk:
  
  http://gcc.gnu.org/ml/gcc-cvs/2007-05/msg00662.html
  http://gcc.gnu.org/ml/gcc-cvs/2007-07/msg00019.html
  http://gcc.gnu.org/ml/gcc-cvs/2007-08/msg00240.html
  http://gcc.gnu.org/ml/gcc-cvs/2007-08/msg00493.html
  
  The first two were always GPL2. The last two were
  added after the GPL3 transition, but were written
  by a...@google.com and Rafael Espíndola got permission
  to relicense them under the GPL2 for inclusion in
  llvm-gcc.
  
  This fixes GCC-PR c++/31749
  
  Obtained from:llvm-gcc (rev. 75463; GPLv2)

Modified:
  stable/10/contrib/gcc/cp/ChangeLog.gcc43
  stable/10/contrib/gcc/cp/decl.c
  stable/10/contrib/gcc/cp/name-lookup.c
  stable/10/contrib/gcc/cp/parser.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/gcc/cp/ChangeLog.gcc43
==
--- stable/10/contrib/gcc/cp/ChangeLog.gcc43Mon Jan 20 21:50:06 2014
(r260931)
+++ stable/10/contrib/gcc/cp/ChangeLog.gcc43Mon Jan 20 21:50:31 2014
(r260932)
@@ -7,6 +7,17 @@
* typeck.c (cxx_alignof_expr): When alignof is used on a plain
FUNCTION_DECL, return its alignment.
 
+2007-07-01  Ollie Wild  a...@google.com (r126177)
+
+   * name-lookup.c (ambiguous_decl): Fix case when new-value is hidden.
+   (select_decl): Remove function.
+   (unqualified_namespace_lookup): Populate binding by calling
+   ambiguous_decl.  Remove select_decl call.
+   (lookup_qualified_name): Remove select_decl call.
+   * decl.c (lookup_and_check_tag): Check for ambiguous references.
+   * parser.c (cp_parser_elaborated_type_specifier): Skip redundant error
+   generation when name lookup is ambiguous.
+
 2007-06-28  Geoffrey Keating  geo...@apple.com (r126088)
 
* decl2.c (determine_visibility): Implement
@@ -29,6 +40,11 @@
 
* typeck.c (build_binary_op): Include types in error.
 
+2007-05-22  Ollie Wild  a...@google.com (r124963)
+ 
+   * name-lookup.c (ambiguous_decl): Adds check for hidden types.
+   (unqualified_namespace_lookup): Adds check for hidden types.
+
 2007-05-18  Geoffrey Keating  geo...@apple.com (r124839)
 
* mangle.c (write_real_cst): Use 'unsigned long' for %lx.

Modified: stable/10/contrib/gcc/cp/decl.c
==
--- stable/10/contrib/gcc/cp/decl.c Mon Jan 20 21:50:06 2014
(r260931)
+++ stable/10/contrib/gcc/cp/decl.c Mon Jan 20 21:50:31 2014
(r260932)
@@ -9784,6 +9784,12 @@ lookup_and_check_tag (enum tag_types tag
   | DECL_SELF_REFERENCE_P (decl));
   return t;
 }
+  else if (decl  TREE_CODE (decl) == TREE_LIST)
+{
+  error (reference to %qD is ambiguous, name);
+  print_candidates (decl);
+  return error_mark_node;
+}
   else
 return NULL_TREE;
 }

Modified: stable/10/contrib/gcc/cp/name-lookup.c
==
--- stable/10/contrib/gcc/cp/name-lookup.c  Mon Jan 20 21:50:06 2014
(r260931)
+++ stable/10/contrib/gcc/cp/name-lookup.c  Mon Jan 20 21:50:31 2014
(r260932)
@@ -42,7 +42,6 @@ struct scope_binding {
 #define EMPTY_SCOPE_BINDING { NULL_TREE, NULL_TREE }
 
 static cxx_scope *innermost_nonclass_level (void);
-static tree select_decl (const struct scope_binding *, int);
 static cxx_binding *binding_for_name (cxx_scope *, tree);
 static tree lookup_name_innermost_nonclass_level (tree);
 static tree push_overloaded_decl (tree, int, bool);
@@ -2100,6 +2099,22 @@ do_nonmember_using_decl (tree scope, tre
   return;
 }
 
+  /* LLVM LOCAL begin mainline */
+  /* Shift the old and new bindings around so we're comparing class and
+ enumeration names to each other.  */
+  if (oldval  DECL_IMPLICIT_TYPEDEF_P (oldval))
+{
+  oldtype = oldval;
+  oldval = NULL_TREE;
+}
+
+  if (decls.value  DECL_IMPLICIT_TYPEDEF_P (decls.value))
+{
+  decls.type = decls.value;
+  decls.value = NULL_TREE;
+}
+  /* LLVM LOCAL end mainline */
+
   /* It is impossible to overload a built-in function; any explicit
  declaration eliminates the built-in declaration.  So, if OLDVAL
  is a built-in, then we can just pretend it isn't there.  */
@@ -2109,95 +2124,112 @@ do_nonmember_using_decl (tree scope, tre
!DECL_HIDDEN_FRIEND_P (oldval))
 oldval = NULL_TREE;
 
-  /* Check for using functions.  */
-  if (decls.value  is_overloaded_fn (decls.value))
+  /* LLVM LOCAL begin mainline */
+  if (decls.value)
 {
-  tree tmp, tmp1;
-
-  if (oldval  !is_overloaded_fn (oldval))
-   {
- if 

svn commit: r260930 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 21:50:04 2014
New Revision: 260930
URL: http://svnweb.freebsd.org/changeset/base/260930

Log:
  Document r260926, support for displaying VPD for PCI devices via
  pciconf(8).
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
21:50:02 2014(r260929)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
21:50:04 2014(r260930)
@@ -168,7 +168,8 @@
   sect2 xml:id=userland
 titleUserland Changes/title
 
-paranbsp;/para
+para revision=260926Support for displaying VPD for PCI devices
+  via man.pciconf.8; has been added./para
 
 sect3 xml:id=rc-scripts
   titlefilename/etc/rc.d/filename Scripts/title
___
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: r260933 - stable/9/contrib/gcc/cp

[Pedro F. Giffuni]

Author: pfg
Date: Mon Jan 20 21:52:00 2014
New Revision: 260933
URL: http://svnweb.freebsd.org/changeset/base/260933

Log:
  MFC   r260332;
  gcc: backport some fixes from llvm-gcc
  
  llvm-gcc backported some patches from gcc trunk:
  
  http://gcc.gnu.org/ml/gcc-cvs/2007-05/msg00662.html
  http://gcc.gnu.org/ml/gcc-cvs/2007-07/msg00019.html
  http://gcc.gnu.org/ml/gcc-cvs/2007-08/msg00240.html
  http://gcc.gnu.org/ml/gcc-cvs/2007-08/msg00493.html
  
  The first two were always GPL2. The last two were
  added after the GPL3 transition, but were written
  by a...@google.com and Rafael Espíndola got permission
  to relicense them under the GPL2 for inclusion in
  llvm-gcc.
  
  This fixes GCC-PR c++/31749
  
  Obtained from:llvm-gcc (rev. 75463; GPLv2)

Modified:
  stable/9/contrib/gcc/cp/decl.c
  stable/9/contrib/gcc/cp/name-lookup.c
  stable/9/contrib/gcc/cp/parser.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/contrib/gcc/   (props changed)

Modified: stable/9/contrib/gcc/cp/decl.c
==
--- stable/9/contrib/gcc/cp/decl.c  Mon Jan 20 21:50:31 2014
(r260932)
+++ stable/9/contrib/gcc/cp/decl.c  Mon Jan 20 21:52:00 2014
(r260933)
@@ -9784,6 +9784,12 @@ lookup_and_check_tag (enum tag_types tag
   | DECL_SELF_REFERENCE_P (decl));
   return t;
 }
+  else if (decl  TREE_CODE (decl) == TREE_LIST)
+{
+  error (reference to %qD is ambiguous, name);
+  print_candidates (decl);
+  return error_mark_node;
+}
   else
 return NULL_TREE;
 }

Modified: stable/9/contrib/gcc/cp/name-lookup.c
==
--- stable/9/contrib/gcc/cp/name-lookup.c   Mon Jan 20 21:50:31 2014
(r260932)
+++ stable/9/contrib/gcc/cp/name-lookup.c   Mon Jan 20 21:52:00 2014
(r260933)
@@ -42,7 +42,6 @@ struct scope_binding {
 #define EMPTY_SCOPE_BINDING { NULL_TREE, NULL_TREE }
 
 static cxx_scope *innermost_nonclass_level (void);
-static tree select_decl (const struct scope_binding *, int);
 static cxx_binding *binding_for_name (cxx_scope *, tree);
 static tree lookup_name_innermost_nonclass_level (tree);
 static tree push_overloaded_decl (tree, int, bool);
@@ -2082,6 +2081,22 @@ do_nonmember_using_decl (tree scope, tre
   return;
 }
 
+  /* LLVM LOCAL begin mainline */
+  /* Shift the old and new bindings around so we're comparing class and
+ enumeration names to each other.  */
+  if (oldval  DECL_IMPLICIT_TYPEDEF_P (oldval))
+{
+  oldtype = oldval;
+  oldval = NULL_TREE;
+}
+
+  if (decls.value  DECL_IMPLICIT_TYPEDEF_P (decls.value))
+{
+  decls.type = decls.value;
+  decls.value = NULL_TREE;
+}
+  /* LLVM LOCAL end mainline */
+
   /* It is impossible to overload a built-in function; any explicit
  declaration eliminates the built-in declaration.  So, if OLDVAL
  is a built-in, then we can just pretend it isn't there.  */
@@ -2091,95 +2106,112 @@ do_nonmember_using_decl (tree scope, tre
!DECL_HIDDEN_FRIEND_P (oldval))
 oldval = NULL_TREE;
 
-  /* Check for using functions.  */
-  if (decls.value  is_overloaded_fn (decls.value))
+  /* LLVM LOCAL begin mainline */
+  if (decls.value)
 {
-  tree tmp, tmp1;
-
-  if (oldval  !is_overloaded_fn (oldval))
-   {
- if (!DECL_IMPLICIT_TYPEDEF_P (oldval))
-   error (%qD is already declared in this scope, name);
- oldval = NULL_TREE;
-   }
-
-  *newval = oldval;
-  for (tmp = decls.value; tmp; tmp = OVL_NEXT (tmp))
+  /* Check for using functions.  */
+  if (is_overloaded_fn (decls.value))
{
- tree new_fn = OVL_CURRENT (tmp);
+ tree tmp, tmp1;
 
- /* [namespace.udecl]
+ if (oldval  !is_overloaded_fn (oldval))
+   {
+ error (%qD is already declared in this scope, name);
+ oldval = NULL_TREE;
+   }
 
-If a function declaration in namespace scope or block
-scope has the same name and the same parameter types as a
-function introduced by a using declaration the program is
-ill-formed.  */
- for (tmp1 = oldval; tmp1; tmp1 = OVL_NEXT (tmp1))
+ *newval = oldval;
+ for (tmp = decls.value; tmp; tmp = OVL_NEXT (tmp))
{
- tree old_fn = OVL_CURRENT (tmp1);
+ tree new_fn = OVL_CURRENT (tmp);
 
- if (new_fn == old_fn)
-   /* The function already exists in the current namespace.  */
-   break;
- else if (OVL_USED (tmp1))
-   continue; /* this is a using decl */
- else if (compparms (TYPE_ARG_TYPES (TREE_TYPE (new_fn)),
- TYPE_ARG_TYPES (TREE_TYPE (old_fn
+ /* [namespace.udecl]
+
+If a function 

svn commit: r260931 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 21:50:06 2014
New Revision: 260931
URL: http://svnweb.freebsd.org/changeset/base/260931

Log:
  Document r260921, nand(4) enabled by default for arm.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
21:50:04 2014(r260930)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
21:50:06 2014(r260931)
@@ -115,7 +115,8 @@
 sect3 xml:id=kernel-arm
   titleARM support/title
 
-  paranbsp;/para
+  para revision=260921The man.nand.4; device is enabled for
+   ARM devices by default./para
 /sect3
 
 sect3 xml:id=boot
___
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: r260934 - head/sys/powerpc/powermac

[Andreas Tobler]

Author: andreast
Date: Mon Jan 20 21:54:05 2014
New Revision: 260934
URL: http://svnweb.freebsd.org/changeset/base/260934

Log:
  Fix the resource information for the i2s-a node on certain G5 PowerMacs.
  This is the first step needed to get the snapper codec working on those
  machines.
  The second step is to enable the corresponding I2S device and its clock.
  
  Tested on machines where the snapper codec was already working, a G4 PowerBook
  and a PowerMac9,1 with a Shasta based macio.
  The PowerMac7,2/7,3 with a K2 based macio can now also play sound.
  
  MFC after:1 month

Modified:
  head/sys/powerpc/powermac/macio.c
  head/sys/powerpc/powermac/maciovar.h

Modified: head/sys/powerpc/powermac/macio.c
==
--- head/sys/powerpc/powermac/macio.c   Mon Jan 20 21:52:00 2014
(r260933)
+++ head/sys/powerpc/powermac/macio.c   Mon Jan 20 21:54:05 2014
(r260934)
@@ -236,13 +236,45 @@ macio_add_intr(phandle_t devnode, struct
 static void
 macio_add_reg(phandle_t devnode, struct macio_devinfo *dinfo)
 {
-   struct  macio_reg *reg;
-   int i, nreg;
+   struct  macio_reg *reg, *regp;
+   phandle_t   child;
+   charbuf[8];
+   int i, layout_id = 0, nreg, res;
 
nreg = OF_getprop_alloc(devnode, reg, sizeof(*reg), (void **)reg);
if (nreg == -1)
return;
 
+/*
+ *  Some G5's have broken properties in the i2s-a area. If so we try
+ *  to fix it. Right now we know of two different cases, one for
+ *  sound layout-id 36 and the other one for sound layout-id 76.
+ *  What is missing is the base address for the memory addresses.
+ *  We take them from the parent node (i2s) and use the size
+ *  information from the child. 
+ */
+
+if (reg[0].mr_base == 0) {
+   child = OF_child(devnode);
+   while (child != 0) {
+   res = OF_getprop(child, name, buf, sizeof(buf));
+   if (res  0  strcmp(buf, sound) == 0)
+   break;
+   child = OF_peer(child);
+   }
+
+res = OF_getprop(child, layout-id, layout_id,
+   sizeof(layout_id));
+
+if (res  0  (layout_id == 36 || layout_id == 76)) {
+res = OF_getprop_alloc(OF_parent(devnode), reg,
+   sizeof(*regp), (void **)regp);
+reg[0] = regp[0];
+reg[1].mr_base = regp[1].mr_base;
+reg[2].mr_base = regp[1].mr_base + reg[1].mr_size;
+}
+} 
+
for (i = 0; i  nreg; i++) {
resource_list_add(dinfo-mdi_resources, SYS_RES_MEMORY, i,
reg[i].mr_base, reg[i].mr_base + reg[i].mr_size,
@@ -284,6 +316,7 @@ macio_attach(device_t dev)
phandle_t  subchild;
 device_t cdev;
 u_int reg[3];
+   char compat[32];
int error, quirks;
 
sc = device_get_softc(dev);
@@ -297,6 +330,9 @@ macio_attach(device_t dev)
return (ENXIO);
}
 
+   /* Used later to see if we have to enable the I2S part. */
+   OF_getprop(root, compatible, compat, sizeof(compat));
+
sc-sc_base = reg[2];
sc-sc_size = MACIO_REG_SIZE;
 
@@ -378,6 +414,21 @@ macio_attach(device_t dev)

bus_write_4(sc-sc_memr, HEATHROW_FCR, fcr);
}
+
+   /*
+* Make sure the I2S0 and the I2S0_CLK are enabled.
+* On certain G5's they are not.
+*/
+   if ((strcmp(ofw_bus_get_name(cdev), i2s) == 0) 
+   (strcmp(compat, K2-Keylargo) == 0)) {
+
+   uint32_t fcr1;
+
+   fcr1 = bus_read_4(sc-sc_memr, KEYLARGO_FCR1);
+   fcr1 |= FCR1_I2S0_CLK_ENABLE | FCR1_I2S0_ENABLE;
+   bus_write_4(sc-sc_memr, KEYLARGO_FCR1, fcr1);
+   }
+
}
 
return (bus_generic_attach(dev));

Modified: head/sys/powerpc/powermac/maciovar.h
==
--- head/sys/powerpc/powermac/maciovar.hMon Jan 20 21:52:00 2014
(r260933)
+++ head/sys/powerpc/powermac/maciovar.hMon Jan 20 21:54:05 2014
(r260934)
@@ -48,6 +48,9 @@
 #define FCR_ENET_ENABLE0x6000
 #define FCR_ENET_RESET 0x8000
 
+#define FCR1_I2S0_CLK_ENABLE   0x1000
+#define FCR1_I2S0_ENABLE   0x2000
+
 /* Used only by macio_enable_wireless() for now. */
 #define KEYLARGO_GPIO_BASE 0x6a
 #define KEYLARGO_EXTINT_GPIO_REG_BASE  0x58
___
svn-src-all@freebsd.org mailing list

svn commit: r260935 - stable/10/contrib/gcc

[Pedro F. Giffuni]

Author: pfg
Date: Mon Jan 20 21:58:20 2014
New Revision: 260935
URL: http://svnweb.freebsd.org/changeset/base/260935

Log:
  MFC   r259531;
  
  gcc: point to our address for bug reports.
  
  As recommended by the FSF in gcc/version.c :
  
  If you distribute a modified version of GCC, please change
  this to refer to a document giving instructions for reporting
  bugs to you, not us.

Modified:
  stable/10/contrib/gcc/version.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/gcc/version.c
==
--- stable/10/contrib/gcc/version.c Mon Jan 20 21:54:05 2014
(r260934)
+++ stable/10/contrib/gcc/version.c Mon Jan 20 21:58:20 2014
(r260935)
@@ -18,7 +18,7 @@
forward us bugs reported to you, if you determine that they are
not bugs in your modifications.)  */
 
-const char bug_report_url[] = URL:http://gcc.gnu.org/bugs.html;
+const char bug_report_url[] = URL:http://www.freebsd.org/send-pr.html;
 
 /* The complete version string, assembled from several pieces.
BASEVER, DATESTAMP, and DEVPHASE are defined by the Makefile.  */
___
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: r260936 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 21:58:29 2014
New Revision: 260936
URL: http://svnweb.freebsd.org/changeset/base/260936

Log:
  Document r260913, onifconsole ttys(5) flag.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
21:58:20 2014(r260935)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
21:58:29 2014(r260936)
@@ -172,6 +172,12 @@
 para revision=260926Support for displaying VPD for PCI devices
   via man.pciconf.8; has been added./para
 
+para revision=260913A new flag, quoteonifconsole/quote has
+  been added to filename/etc/ttys/filename.  This allows the
+  system to provide a login prompt via serial console if the
+  device is an active kernel console, otherwise it is equivalent
+  to literaloff/literal./para
+
 sect3 xml:id=rc-scripts
   titlefilename/etc/rc.d/filename Scripts/title
 
___
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: r260928 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 21:50:00 2014
New Revision: 260928
URL: http://svnweb.freebsd.org/changeset/base/260928

Log:
  Remove entries that:
   - exist in a release [1]
   - do not have a corresponding revision class
  
  [1] This is done to make ensure for 11.0-RELEASE, we do not end
  up with entries from older releases, like happened with 10.0-R.
  
  Approved by:  re (implicit)
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
21:49:59 2014(r260927)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
21:50:00 2014(r260928)
@@ -104,132 +104,28 @@
   sect2 xml:id=kernel
 titleKernel Changes/title
 
-para revision=248508The use of unmapped VMIO buffers
-  eliminates the need to perform TLB shootdown for mapping on
-  buffer creation and reuse, greatly reducing the amount of IPIs
-  for shootdown on big-SMP machines and eliminating up to 25-30%
-  of the system time on i/o intensive workloads./para
-
-para arch=amd64 revision=254466The maximum amount of memory
-  the os; kernel can address has been increased from 1TB to
-  4TB./para
-
-para role=mergedThe man.ddb.4; kernel debugger now has an
-  output capture facility.  Input and output from man.ddb.4; can
-  now be captured to a memory buffer for later inspection using
-  man.sysctl.8; or a textdump.  The new
-  commandcapture/command command controls this feature./para
-
-para role=mergedThe man.ddb.4; debugger now supports a simple
-  scripting facility, which supports a set of named scripts
-  consisting of a set of man.ddb.4; commands.  These commands can
-  be managed from within man.ddb.4; or with the use of the new
-  man.ddb.8; utility.  More details can be found in the
-  man.ddb.4; manual page./para
-
-para arch=amd64,i386 revision=240135Support was added for
-  the new Intel on-CPU Bull Mountain random number generator,
-  found on IvyBridge and supposedly later CPUs, accessible with
-  RDRAND instruction./para
+paranbsp;/para
 
 sect3 xml:id=kernel-virtualization
   titleVirtualization support/title
 
-  para arch=amd64 revision=245652The BSD Hypervisor,
-   man.bhyve.8; is included with os;.  man.bhyve.8; requires
-   Intel CPUs with VT-x and Extended Page Table (EPT) support.
-   These features are on all Nehalem models and beyond (e.g.
-   Nehalem and newer), but not on the lower-end Atom CPUs./para
-
-  para revision=227652man.virtio.4; support has been added.
-   man.virtio.4; is the name for the paravirtualization
-   interface developed for the Linux KVM, but since adopted to
-   other virtual machine hypervisors (with the notable exception
-   of Xen).  This work brings in a BSD-licensed clean-room
-   implementation of the virtio kernel drivers for disk IO
-   (man.virtio_blk.4; and man.virtio_scsi.4;), network IO
-   (man.vtnet.4;), memory ballooning (man.virtio_balloon.4;),
-   and PCI.  Tested with on Qemu/KVM, VirtualBox, and
-   man.bhyve.4;./para
-
-  para arch=amd64,i386 revision=255524Paravirtualized
-   drivers which support Microsoft Hyper-V have been imported and
-   made part of the amd64 GENERIC kernel.  For i386, these
-   drivers are not part of GENERIC, so the following lines must
-   be added to filename/boot/loader.conf/filename to load
-   these drivers:/para
-
-  programlistinghv_ata_pci_disengage_load=YES
-hv_netsvc_load=YES
-hv_utils_load=YES
-hv_vmbus_load=YES/programlisting
-
-  paraAlternatively, the Hyper-V drivers can be added to the
-   i386 kernel by adding literaldevice hyperv/literal to the
-   kernel config, and then recompiling the kernel.  Please refer
-   to: link xlink:href=http://wiki.freebsd.org/HyperV;FreeBSD
- and Microsoft Windows Server Hyper-V support/link for full
-   instructions on how to set up Hyper-V support under
-   FreeBSD./para
-
-  para revision=254738The man.vmx.4; driver has been added.
-   man.vmx.4; is a VMware VMXNET3 ethernet driver ported from
-   OpenBSD./para
-
-  para revision=255744 arch=amd64,i386Xen PVHVM
-   virtualization is now part of the GENERIC kernel./para
+  paranbsp;/para
 
 /sect3
 
 sect3 xml:id=kernel-arm
   titleARM support/title
 
-  para revision=239922Raspberry PI support has been added.
-   Refer to these link
- xlink:href=http://kernelnomicon.org/?p=164;setup
- instructions/link and link
- xlink:href=http://www.raspberrypi.org/quick-start-guide;quick
- start guide/link./para
-
-  para revision=253396The default ABI on ARM is now the 

svn commit: r260929 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 21:50:02 2014
New Revision: 260929
URL: http://svnweb.freebsd.org/changeset/base/260929

Log:
  Final sweep to remove items that now exist in a release.
  While here, clean up spacing between closing para tags and closing
  sectN tags.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
21:50:00 2014(r260928)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
21:50:02 2014(r260929)
@@ -110,21 +110,18 @@
   titleVirtualization support/title
 
   paranbsp;/para
-
 /sect3
 
 sect3 xml:id=kernel-arm
   titleARM support/title
 
   paranbsp;/para
-
 /sect3
 
 sect3 xml:id=boot
   titleBoot Loader Changes/title
 
   paranbsp;/para
-
 /sect3
 
 sect3 xml:id=proc
@@ -134,14 +131,12 @@
titleMultimedia Support/title
 
paranbsp;/para
-
   /sect4
 
   sect4 xml:id=net-if
titleNetwork Interface Support/title
 
paranbsp;/para
-
   /sect4
 /sect3
 
@@ -149,14 +144,12 @@
   titleNetwork Protocols/title
 
   paranbsp;/para
-
 /sect3
 
 sect3 xml:id=disks
   titleDisks and Storage/title
 
   paranbsp;/para
-
 /sect3
 
 sect3 xml:id=fs
@@ -168,7 +161,6 @@
titleZFS/title
 
paranbsp;/para
-
   /sect4
 /sect3
   /sect2
@@ -176,169 +168,7 @@
   sect2 xml:id=userland
 titleUserland Changes/title
 
-para revision=255321On platforms where man.clang.1; is the
-  default system compiler, (such as i386, amd64, arm) GCC and GNU
-  libstdc++ are no longer built by default.  man.clang.1; and
-  libc++ from LLVM are used on these platforms by instead.  GCC
-  4.2.1 and libstdc++ are still built and used by default on pc98
-   and all other platforms where man.clang.1; is not the default
-   system compiler./para
-
-para revision=251662man.clang.1; and llvm have been updated
- to version 3.3 release.  Please refer to link
-   
xlink:href=http://llvm.org/releases/3.3/tools/clang/docs/ReleaseNotes.html;
-   Clang 3.3 Release Notes./link/para
-
-para role=merged revision=255949BIND has been replaced by
-  man.unbound.8; for local dns resolution in the base system.
-  With this change, nslookup and dig are no longer a part of the
-  base system.  Users should instead use man.host.1; and
-  man.drill.1; Alternatively, nslookup and dig can be obtained by
-  installing the dns/bind-tools port./para
-
-para revision=225937sysinstall has been removed from the base
-  system.  Auxiliary libraries and tools used by sysinstall such
-  as libdisk, libftpio, and sade have also been removed.
-  sysinstall has been replaced by man.bsdinstall.8; and
-  man.bsdconfig.8;./para
-
-para revision=256106man.freebsd-version.1; has been added.
-  This tool makes a best effort to determine the version and patch
-  level of the installed kernel and userland./para
-
-para revision=255191GNU patch has been removed from the base
-  system, and replaced by a BSD-licensed man.patch.1;
-  program./para
-
-para revision=241511GNU sort has been removed from the base
-  system, and replaced by a BSD-licensed man.sort.1;
-  program./para
-
-para revision=235723Berkely yacc (byacc) has been imported
-  from link
-   xlink:href=http://invisible-island.net/byacc/;invisible
-   island/link.  This brings bison compatibilities to
-  man.yacc.1; while preserving full backwards compatibility with
-  previous version of man.yacc.1;./para
-
-para revision=250881man.lex.1; has been replaced by flex
-  2.5.37/para
-
-para revision=250699man.make.1; has been replaced with the
-  quotePortable/quote BSD make tool (bmake) from NetBSD./para
-
-para revision=243023Support for usernames up to 32
-  characters./para
-
-para role=mergedThe man.adduser.8; utility now supports
-  a option-M/option option to set the mode of a new user's
-  home directory./para
-
-paraBSD-licensed versions of man.ar.1; and man.ranlib.1;,
-  based on filenamelibarchive/filename, have replaced the GNU
-  Binutils versions of these utilities./para
-
-paraBSD-licensed versions of man.bc.1; and man.dc.1; have
-  replaced their GNU counterparts./para
-
-para role=mergedman.chflags.1; now supports
-  a option-v/option flag for verbose output and
-  a option-f/option flag to ignore errors with the same
-  semantics as (for example) man.chmod.1;./para
-
-paraFor compatibility with other implementations, man.cp.1; now
-  supports a option-a/option flag, which is equivalent to
-  specifying the 

svn commit: r260937 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 22:08:09 2014
New Revision: 260937
URL: http://svnweb.freebsd.org/changeset/base/260937

Log:
  Document r260910.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
21:58:29 2014(r260936)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
22:08:09 2014(r260937)
@@ -178,6 +178,13 @@
   device is an active kernel console, otherwise it is equivalent
   to literaloff/literal./para
 
+para revision=260910Allow man.pciconf.8; to identify PCI
+  devices that are attached to a driver to be identified by their
+  device name instead of just the selector.  Additionally, an
+  optional device argument to the literal-l/literal flag
+  to restrict the output to only listing details about a single
+  device./para
+
 sect3 xml:id=rc-scripts
   titlefilename/etc/rc.d/filename Scripts/title
 
___
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: r260938 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 22:08:11 2014
New Revision: 260938
URL: http://svnweb.freebsd.org/changeset/base/260938

Log:
  Document r260903.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
22:08:09 2014(r260937)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
22:08:11 2014(r260938)
@@ -117,6 +117,9 @@
 
   para revision=260921The man.nand.4; device is enabled for
ARM devices by default./para
+
+  para revision=260903Support for GPS ports has been added to
+   man.uhso.4;./para
 /sect3
 
 sect3 xml:id=boot
___
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: r260898 - head/sys/kern

[Alexander Kabaev]

On Mon, 20 Jan 2014 11:32:29 -0500
John Baldwin j...@freebsd.org wrote:

 On Sunday 19 January 2014 18:18:03 Rui Paulo wrote:
  On 19 Jan 2014, at 17:59, Neel Natu n...@freebsd.org wrote:
   Author: neel
   Date: Mon Jan 20 01:59:35 2014
   New Revision: 260898
   URL: http://svnweb.freebsd.org/changeset/base/260898
   
   Log:
Bump up WITNESS_COUNT from 1024 to 1536 so there are sufficient
   entries for
WITNESS to actually work.
  
  This value should be automatically tuned...
 
 How do you propose to do so?  This is the count of locks initialized
 before witness' own SYSINIT is executed and the array it sizes is
 allocated statically at compile time.  This used to not be a static
 array, but an intrusive list embedded in locks themselves, but we
 decided to shave a pointer off of each lock that was only used for
 that and to use a statically sized table instead.
 
 -- 
 John Baldwin

As CONSTANT1 + CONSTANT2 * MAXCPU, as evidently most recent
overflows reported were caused by jacking MAXCPU up from its default
value? 

-- 
Alexander Kabaev


signature.asc
Description: PGP signature

svn commit: r260939 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 22:25:50 2014
New Revision: 260939
URL: http://svnweb.freebsd.org/changeset/base/260939

Log:
  Document r260888.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
22:08:11 2014(r260938)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
22:25:50 2014(r260939)
@@ -104,7 +104,9 @@
   sect2 xml:id=kernel
 titleKernel Changes/title
 
-paranbsp;/para
+para revision=260888Add a filenameVT/filename kernel
+  configuration file, which enables the new literalvt/literal
+  console driver./para
 
 sect3 xml:id=kernel-virtualization
   titleVirtualization support/title
___
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: r260940 - stable/10

[Glen Barber]

Author: gjb
Date: Mon Jan 20 22:32:23 2014
New Revision: 260940
URL: http://svnweb.freebsd.org/changeset/base/260940

Log:
  Add UPDATING entry for 10.0-RELEASE.
  
  Approved by:  re (implicit)
  Sponsored by: The FreeBSD Foundation

Modified:
  stable/10/UPDATING

Modified: stable/10/UPDATING
==
--- stable/10/UPDATING  Mon Jan 20 22:25:50 2014(r260939)
+++ stable/10/UPDATING  Mon Jan 20 22:32:23 2014(r260940)
@@ -16,6 +16,9 @@ from older versions of FreeBSD, try WITH
 stable/10, and then rebuild without this option. The bootstrap process from
 older version of current is a bit fragile.
 
+20140120:
+   10.0-RELEASE.
+
 20131216:
The behavior of gss_pseudo_random() for the krb5 mechanism
has changed, for applications requesting a longer random string
___
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: r260942 - head/usr.sbin/pkg

[Baptiste Daroussin]

Author: bapt
Date: Mon Jan 20 22:54:11 2014
New Revision: 260942
URL: http://svnweb.freebsd.org/changeset/base/260942

Log:
  Implicit include of sys/queue.h instead of relying on gelf.h/libelf.h to 
bring it
  Newer version of gelf.h and libelf.h does not include sys/queue.h anymore
  
  Submitted by: kaiw
  MFC after:3 days

Modified:
  head/usr.sbin/pkg/config.c

Modified: head/usr.sbin/pkg/config.c
==
--- head/usr.sbin/pkg/config.c  Mon Jan 20 22:54:06 2014(r260941)
+++ head/usr.sbin/pkg/config.c  Mon Jan 20 22:54:11 2014(r260942)
@@ -29,6 +29,7 @@
 __FBSDID($FreeBSD$);
 
 #include sys/param.h
+#include sys/queue.h
 #include sys/sbuf.h
 #include sys/elf_common.h
 #include sys/endian.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: r260944 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 23:08:33 2014
New Revision: 260944
URL: http://svnweb.freebsd.org/changeset/base/260944

Log:
  Document r260594.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:08:31 2014(r260943)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:08:33 2014(r260944)
@@ -193,6 +193,11 @@
   to restrict the output to only listing details about a single
   device./para
 
+para revision=260594When unable to load a kernel module with
+  man.kldload.8;, a message informing to view output of
+  man.dmesg.8; is now printed, opposed to the previous output
+  quoteExec format error./quote./para
+
 sect3 xml:id=rc-scripts
   titlefilename/etc/rc.d/filename Scripts/title
 
___
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: r260943 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 23:08:31 2014
New Revision: 260943
URL: http://svnweb.freebsd.org/changeset/base/260943

Log:
  Document r260847.
  Reword entry for r260888.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
22:54:11 2014(r260942)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:08:31 2014(r260943)
@@ -104,9 +104,12 @@
   sect2 xml:id=kernel
 titleKernel Changes/title
 
-para revision=260888Add a filenameVT/filename kernel
-  configuration file, which enables the new literalvt/literal
-  console driver./para
+para revision=260888The filenameVT/filename kernel
+  configuration file has been added, which enables the new
+  literalvt/literal console driver./para
+
+para revision=260847The man.virtio_random.4; driver has been
+  added to harvest entropy from the host system./para
 
 sect3 xml:id=kernel-virtualization
   titleVirtualization support/title
___
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: r260945 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 23:12:10 2014
New Revision: 260945
URL: http://svnweb.freebsd.org/changeset/base/260945

Log:
  Move r260847 to 'kernel-virtualization'.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:08:33 2014(r260944)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:12:10 2014(r260945)
@@ -108,13 +108,11 @@
   configuration file has been added, which enables the new
   literalvt/literal console driver./para
 
-para revision=260847The man.virtio_random.4; driver has been
-  added to harvest entropy from the host system./para
-
 sect3 xml:id=kernel-virtualization
   titleVirtualization support/title
 
-  paranbsp;/para
+  para revision=260847The man.virtio_random.4; driver has
+   been added to harvest entropy from the host system./para
 /sect3
 
 sect3 xml:id=kernel-arm
___
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: r260946 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 23:12:12 2014
New Revision: 260946
URL: http://svnweb.freebsd.org/changeset/base/260946

Log:
  Document r260583.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:12:10 2014(r260945)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:12:12 2014(r260946)
@@ -113,6 +113,9 @@
 
   para revision=260847The man.virtio_random.4; driver has
been added to harvest entropy from the host system./para
+
+  para revision=260583Unmapped IO support has been added to
+   man.virtio_scsi.4;./para
 /sect3
 
 sect3 xml:id=kernel-arm
___
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: r260947 - stable/10/bin/df

[Warren Block]

Author: wblock (doc committer)
Date: Mon Jan 20 23:23:29 2014
New Revision: 260947
URL: http://svnweb.freebsd.org/changeset/base/260947

Log:
  MFC r260782:
  
  -h and -H options backwards in manual page.

Modified:
  stable/10/bin/df/df.1
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/bin/df/df.1
==
--- stable/10/bin/df/df.1   Mon Jan 20 23:12:12 2014(r260946)
+++ stable/10/bin/df/df.1   Mon Jan 20 23:23:29 2014(r260947)
@@ -29,7 +29,7 @@
 .\ @(#)df.1   8.3 (Berkeley) 5/8/95
 .\ $FreeBSD$
 .\
-.Dd January 24, 2013
+.Dd January 16, 2014
 .Dt DF 1
 .Os
 .Sh NAME
@@ -83,13 +83,13 @@ Use 1073741824 byte (1 Gibibyte) blocks 
 This overrides any
 .Ev BLOCKSIZE
 specification from the environment.
-.It Fl H
+.It Fl h
 .Dq Human-readable
 output.
 Use unit suffixes: Byte, Kibibyte, Mebibyte, Gibibyte, Tebibyte and
 Pebibyte (based on powers of 1024) in order to reduce the number of
 digits to four or fewer.
-.It Fl h
+.It Fl H
 .Dq Human-readable
 output.
 Use unit suffixes: Byte, Kilobyte, Megabyte,
___
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: r260948 - stable/9/bin/df

[Warren Block]

Author: wblock (doc committer)
Date: Mon Jan 20 23:25:52 2014
New Revision: 260948
URL: http://svnweb.freebsd.org/changeset/base/260948

Log:
  MFC r260782:
  
  -h and -H options backwards in manual page.

Modified:
  stable/9/bin/df/df.1
Directory Properties:
  stable/9/bin/df/   (props changed)

Modified: stable/9/bin/df/df.1
==
--- stable/9/bin/df/df.1Mon Jan 20 23:23:29 2014(r260947)
+++ stable/9/bin/df/df.1Mon Jan 20 23:25:52 2014(r260948)
@@ -29,7 +29,7 @@
 .\ @(#)df.1   8.3 (Berkeley) 5/8/95
 .\ $FreeBSD$
 .\
-.Dd January 24, 2013
+.Dd January 16, 2014
 .Dt DF 1
 .Os
 .Sh NAME
@@ -83,13 +83,13 @@ Use 1073741824 byte (1 Gibibyte) blocks 
 This overrides any
 .Ev BLOCKSIZE
 specification from the environment.
-.It Fl H
+.It Fl h
 .Dq Human-readable
 output.
 Use unit suffixes: Byte, Kibibyte, Mebibyte, Gibibyte, Tebibyte and
 Pebibyte (based on powers of 1024) in order to reduce the number of
 digits to four or fewer.
-.It Fl h
+.It Fl H
 .Dq Human-readable
 output.
 Use unit suffixes: Byte, Kilobyte, Megabyte,
___
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: r260949 - in head/sys/boot: i386/libi386 pc98/libpc98

[Alexander Motin]

Author: mav
Date: Mon Jan 20 23:27:05 2014
New Revision: 260949
URL: http://svnweb.freebsd.org/changeset/base/260949

Log:
  Make comconsole options set before its activation to be remembered.
  
  MFC after:2 weeks
  Sponsored by: iXsystems, Inc.

Modified:
  head/sys/boot/i386/libi386/comconsole.c
  head/sys/boot/pc98/libpc98/comconsole.c

Modified: head/sys/boot/i386/libi386/comconsole.c
==
--- head/sys/boot/i386/libi386/comconsole.c Mon Jan 20 23:25:52 2014
(r260948)
+++ head/sys/boot/i386/libi386/comconsole.c Mon Jan 20 23:27:05 2014
(r260949)
@@ -181,8 +181,7 @@ comc_speed_set(struct env_var *ev, int f
return (CMD_ERROR);
 }
 
-if ((comconsole.c_flags  (C_ACTIVEIN | C_ACTIVEOUT)) != 0 
-   comc_curspeed != speed)
+if (comc_curspeed != speed)
comc_setup(speed, comc_port);
 
 env_setenv(ev-ev_name, flags | EV_NOHOOK, value, NULL, NULL);
@@ -200,8 +199,7 @@ comc_port_set(struct env_var *ev, int fl
return (CMD_ERROR);
 }
 
-if ((comconsole.c_flags  (C_ACTIVEIN | C_ACTIVEOUT)) != 0 
-   comc_port != port)
+if (comc_port != port)
comc_setup(comc_curspeed, port);
 
 env_setenv(ev-ev_name, flags | EV_NOHOOK, value, NULL, NULL);
@@ -309,6 +307,8 @@ comc_setup(int speed, int port)
 unsetenv(hw.uart.console);
 comc_curspeed = speed;
 comc_port = port;
+if ((comconsole.c_flags  (C_ACTIVEIN | C_ACTIVEOUT)) == 0)
+   return;
 
 outb(comc_port + com_cfcr, CFCR_DLAB | COMC_FMT);
 outb(comc_port + com_dlbl, COMC_BPS(speed)  0xff);

Modified: head/sys/boot/pc98/libpc98/comconsole.c
==
--- head/sys/boot/pc98/libpc98/comconsole.c Mon Jan 20 23:25:52 2014
(r260948)
+++ head/sys/boot/pc98/libpc98/comconsole.c Mon Jan 20 23:27:05 2014
(r260949)
@@ -181,8 +181,7 @@ comc_speed_set(struct env_var *ev, int f
return (CMD_ERROR);
 }
 
-if ((comconsole.c_flags  (C_ACTIVEIN | C_ACTIVEOUT)) != 0 
-   comc_curspeed != speed)
+if (comc_curspeed != speed)
comc_setup(speed, comc_port);
 
 env_setenv(ev-ev_name, flags | EV_NOHOOK, value, NULL, NULL);
@@ -200,8 +199,7 @@ comc_port_set(struct env_var *ev, int fl
return (CMD_ERROR);
 }
 
-if ((comconsole.c_flags  (C_ACTIVEIN | C_ACTIVEOUT)) != 0 
-   comc_port != port)
+if (comc_port != port)
comc_setup(comc_curspeed, port);
 
 env_setenv(ev-ev_name, flags | EV_NOHOOK, value, NULL, NULL);
@@ -309,6 +307,8 @@ comc_setup(int speed, int port)
 unsetenv(hw.uart.console);
 comc_curspeed = speed;
 comc_port = port;
+if ((comconsole.c_flags  (C_ACTIVEIN | C_ACTIVEOUT)) == 0)
+   return;
 
 outb(comc_port + com_cfcr, CFCR_DLAB | COMC_FMT);
 outb(comc_port + com_dlbl, COMC_BPS(speed)  0xff);
___
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: r260952 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 23:31:20 2014
New Revision: 260952
URL: http://svnweb.freebsd.org/changeset/base/260952

Log:
  Document r260532.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:31:18 2014(r260951)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:31:20 2014(r260952)
@@ -108,6 +108,16 @@
   configuration file has been added, which enables the new
   literalvt/literal console driver./para
 
+para revision=260532Support for quotePosted Interrupt
+   Processing/quote is enabled if supported by the CPU.
+  This feature can be disabled with:/para
+
+screenuserinputprompt.root; sysctl 
hw.vmm.vmx.use_apic_pir=0/userinput/screen
+
+paraAdditionally, to persist this setting across reboots, add
+  literalhw.vmm.vmx.use_apic_pir=0/literal to
+  filename/etc/sysctl.conf/filename./para
+
 sect3 xml:id=kernel-virtualization
   titleVirtualization support/title
 
___
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: r260951 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 23:31:18 2014
New Revision: 260951
URL: http://svnweb.freebsd.org/changeset/base/260951

Log:
  Document r260552.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:31:16 2014(r260950)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:31:18 2014(r260951)
@@ -149,7 +149,9 @@
   sect4 xml:id=net-if
titleNetwork Interface Support/title
 
-   paranbsp;/para
+   para revision=260552Firmware for intel;
+ Centrinotrade; Wireless-N 105 devices has been added
+ to the base system./para
   /sect4
 /sect3
 
___
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: r260950 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 23:31:16 2014
New Revision: 260950
URL: http://svnweb.freebsd.org/changeset/base/260950

Log:
  Document r260582.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:27:05 2014(r260949)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:31:16 2014(r260950)
@@ -116,6 +116,9 @@
 
   para revision=260583Unmapped IO support has been added to
man.virtio_scsi.4;./para
+
+  para revision=260582Unmapped IO support has been added to
+   man.virtio_blk.4;./para
 /sect3
 
 sect3 xml:id=kernel-arm
___
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: r260953 - head/sys/dev/vt/hw/fb

[Aleksandr Rybalko]

Author: ray
Date: Mon Jan 20 23:36:16 2014
New Revision: 260953
URL: http://svnweb.freebsd.org/changeset/base/260953

Log:
  Style(9) fix.
  No functional changes.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/sys/dev/vt/hw/fb/vt_fb.c

Modified: head/sys/dev/vt/hw/fb/vt_fb.c
==
--- head/sys/dev/vt/hw/fb/vt_fb.c   Mon Jan 20 23:31:20 2014
(r260952)
+++ head/sys/dev/vt/hw/fb/vt_fb.c   Mon Jan 20 23:36:16 2014
(r260953)
@@ -69,8 +69,9 @@ vt_fb_ioctl(struct vt_device *vd, u_long
return (info-fb_ioctl(info-fb_cdev, cmd, data, 0, td));
 }
 
-static int vt_fb_mmap(struct vt_device *vd, vm_ooffset_t offset,
-vm_paddr_t *paddr, int prot, vm_memattr_t *memattr)
+static int
+vt_fb_mmap(struct vt_device *vd, vm_ooffset_t offset, vm_paddr_t *paddr,
+int prot, vm_memattr_t *memattr)
 {
struct fb_info *info;
 
___
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: r260954 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 23:50:30 2014
New Revision: 260954
URL: http://svnweb.freebsd.org/changeset/base/260954

Log:
  Document r260448.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:36:16 2014(r260953)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:50:30 2014(r260954)
@@ -162,6 +162,10 @@
para revision=260552Firmware for intel;
  Centrinotrade; Wireless-N 105 devices has been added
  to the base system./para
+
+   para revision=260448Support for the intel;
+ Centrinotrade; Wireless-N 135 chipset has been
+ added./para
   /sect4
 /sect3
 
___
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: r260955 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 23:50:32 2014
New Revision: 260955
URL: http://svnweb.freebsd.org/changeset/base/260955

Log:
  Move r260532 to kernel-virtualization.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:50:30 2014(r260954)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:50:32 2014(r260955)
@@ -108,16 +108,6 @@
   configuration file has been added, which enables the new
   literalvt/literal console driver./para
 
-para revision=260532Support for quotePosted Interrupt
-   Processing/quote is enabled if supported by the CPU.
-  This feature can be disabled with:/para
-
-screenuserinputprompt.root; sysctl 
hw.vmm.vmx.use_apic_pir=0/userinput/screen
-
-paraAdditionally, to persist this setting across reboots, add
-  literalhw.vmm.vmx.use_apic_pir=0/literal to
-  filename/etc/sysctl.conf/filename./para
-
 sect3 xml:id=kernel-virtualization
   titleVirtualization support/title
 
@@ -129,6 +119,16 @@
 
   para revision=260582Unmapped IO support has been added to
man.virtio_blk.4;./para
+
+  para revision=260532Support for quotePosted Interrupt
+ Processing/quote is enabled if supported by the CPU.
+   This feature can be disabled with:/para
+
+  screenuserinputprompt.root; sysctl 
hw.vmm.vmx.use_apic_pir=0/userinput/screen
+
+  paraAdditionally, to persist this setting across reboots, add
+   literalhw.vmm.vmx.use_apic_pir=0/literal to
+   filename/etc/sysctl.conf/filename./para
 /sect3
 
 sect3 xml:id=kernel-arm
___
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: r260956 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 23:50:34 2014
New Revision: 260956
URL: http://svnweb.freebsd.org/changeset/base/260956

Log:
  Document r260410.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:50:32 2014(r260955)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:50:34 2014(r260956)
@@ -129,6 +129,17 @@
   paraAdditionally, to persist this setting across reboots, add
literalhw.vmm.vmx.use_apic_pir=0/literal to
filename/etc/sysctl.conf/filename./para
+
+  para revision=260410Support for the quoteVirtual Interrupt
+ Delivery/quote feature of intel;nbsp;VT-x is enabled if
+   supported by the CPU.  This feature can be disabled
+   with:/para
+
+  screenuserinputprompt.root; sysctl 
hw.vmm.vmx.use_apic_vid=0/userinput/screen
+
+  paraAdditionally, to persist this setting across reboots, add
+   literalhw.vmm.vmx.use_apic_vid=0/literal to
+   filename/etc/sysctl.conf/filename./para
 /sect3
 
 sect3 xml:id=kernel-arm
___
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: r260957 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 23:52:28 2014
New Revision: 260957
URL: http://svnweb.freebsd.org/changeset/base/260957

Log:
  Move r260903, misplaced.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:50:34 2014(r260956)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:52:28 2014(r260957)
@@ -104,6 +104,9 @@
   sect2 xml:id=kernel
 titleKernel Changes/title
 
+para revision=260903Support for GPS ports has been added to
+  man.uhso.4;./para
+
 para revision=260888The filenameVT/filename kernel
   configuration file has been added, which enables the new
   literalvt/literal console driver./para
@@ -147,9 +150,6 @@
 
   para revision=260921The man.nand.4; device is enabled for
ARM devices by default./para
-
-  para revision=260903Support for GPS ports has been added to
-   man.uhso.4;./para
 /sect3
 
 sect3 xml:id=boot
___
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: r260958 - stable/10/sys/cam/scsi

[Alexander Motin]

Author: mav
Date: Mon Jan 20 23:56:49 2014
New Revision: 260958
URL: http://svnweb.freebsd.org/changeset/base/260958

Log:
  MFC r260407:
  Allow delete_method sysctl to be set to DISABLE.

Modified:
  stable/10/sys/cam/scsi/scsi_da.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/scsi/scsi_da.c
==
--- stable/10/sys/cam/scsi/scsi_da.cMon Jan 20 23:52:28 2014
(r260957)
+++ stable/10/sys/cam/scsi/scsi_da.cMon Jan 20 23:56:49 2014
(r260958)
@@ -1959,7 +1959,7 @@ dadeletemethodsysctl(SYSCTL_HANDLER_ARGS
char buf[16];
const char *p;
struct da_softc *softc;
-   int i, error, value;
+   int i, error, methods, value;
 
softc = (struct da_softc *)arg1;
 
@@ -1972,8 +1972,9 @@ dadeletemethodsysctl(SYSCTL_HANDLER_ARGS
error = sysctl_handle_string(oidp, buf, sizeof(buf), req);
if (error != 0 || req-newptr == NULL)
return (error);
+   methods = softc-delete_available | (1  DA_DELETE_DISABLE);
for (i = 0; i = DA_DELETE_MAX; i++) {
-   if (!(softc-delete_available  (1  i)) ||
+   if (!(methods  (1  i)) ||
strcmp(buf, da_delete_method_names[i]) != 0)
continue;
dadeletemethodset(softc, i);
___
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: r260959 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Mon Jan 20 23:59:32 2014
New Revision: 260959
URL: http://svnweb.freebsd.org/changeset/base/260959

Log:
  Reformat to fix a nit in the rendered output.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:56:49 2014(r260958)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Mon Jan 20 
23:59:32 2014(r260959)
@@ -124,23 +124,18 @@
man.virtio_blk.4;./para
 
   para revision=260532Support for quotePosted Interrupt
- Processing/quote is enabled if supported by the CPU.
-   This feature can be disabled with:/para
-
-  screenuserinputprompt.root; sysctl 
hw.vmm.vmx.use_apic_pir=0/userinput/screen
-
-  paraAdditionally, to persist this setting across reboots, add
+ Processing/quote is enabled if supported by the CPU.  This
+   feature can be disabled by running literalsysctl
+ hw.vmm.vmx.use_apic_pir=0/literal.  Additionally, to
+   persist this setting across reboots, add
literalhw.vmm.vmx.use_apic_pir=0/literal to
filename/etc/sysctl.conf/filename./para
 
   para revision=260410Support for the quoteVirtual Interrupt
  Delivery/quote feature of intel;nbsp;VT-x is enabled if
-   supported by the CPU.  This feature can be disabled
-   with:/para
-
-  screenuserinputprompt.root; sysctl 
hw.vmm.vmx.use_apic_vid=0/userinput/screen
-
-  paraAdditionally, to persist this setting across reboots, add
+   supported by the CPU.  This feature can be disabled by running
+   literalsysctl hw.vmm.vmx.use_apic_vid=0/literal.
+   Additionally, to persist this setting across reboots, add
literalhw.vmm.vmx.use_apic_vid=0/literal to
filename/etc/sysctl.conf/filename./para
 /sect3
___
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: r260960 - stable/9/sys/cam/scsi

[Alexander Motin]

Author: mav
Date: Tue Jan 21 00:14:06 2014
New Revision: 260960
URL: http://svnweb.freebsd.org/changeset/base/260960

Log:
  MFC r254970 (by ken):
  If a drive returns ASC/ASCQ 0x04,0x11 Logical unit not ready,
  notify (enable spinup) required, instead of doing the normal
  retries, poll for a change in status.
  
  We will poll every half second for a minute for the status to
  change.
  
  Hitachi drives (and likely other SAS drives) return that ASC/ASCQ
  when they are waiting to spin up.  What it means is that they are
  waiting for the SAS expander to send them the SAS
  NOTIFY (ENABLE SPINUP) primitive.
  
  That primitive is the mechanism expanders/enclosures use to
  sequence drive spinup to avoid overloading power supplies.

Modified:
  stable/9/sys/cam/scsi/scsi_all.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cam/scsi/scsi_all.c
==
--- stable/9/sys/cam/scsi/scsi_all.cMon Jan 20 23:59:32 2014
(r260959)
+++ stable/9/sys/cam/scsi/scsi_all.cTue Jan 21 00:14:06 2014
(r260960)
@@ -1118,7 +1118,7 @@ static struct asc_table_entry asc_table[
{ SST(0x04, 0x10, SS_RDEF,  /* XXX TBD */
Logical unit not ready, auxiliary memory not accessible) },
/* DT  WRO AEB VF */
-   { SST(0x04, 0x11, SS_RDEF,  /* XXX TBD */
+   { SST(0x04, 0x11, SS_TUR | SSQ_MANY | SSQ_DECREMENT_COUNT | EBUSY,
Logical unit not ready, notify (enable spinup) required) },
/*MV  */
{ SST(0x04, 0x12, SS_RDEF,  /* XXX TBD */
___
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: r260961 - in stable/9: sbin/camcontrol sys/cam/scsi

[Alexander Motin]

Author: mav
Date: Tue Jan 21 00:16:41 2014
New Revision: 260961
URL: http://svnweb.freebsd.org/changeset/base/260961

Log:
  MFC r255307 (by bryanv):
  Add camcontrol support for the SCSI sanitize command

Modified:
  stable/9/sbin/camcontrol/camcontrol.8
  stable/9/sbin/camcontrol/camcontrol.c
  stable/9/sys/cam/scsi/scsi_da.c
  stable/9/sys/cam/scsi/scsi_da.h
Directory Properties:
  stable/9/   (props changed)
  stable/9/sbin/   (props changed)
  stable/9/sbin/camcontrol/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/sbin/camcontrol/camcontrol.8
==
--- stable/9/sbin/camcontrol/camcontrol.8   Tue Jan 21 00:14:06 2014
(r260960)
+++ stable/9/sbin/camcontrol/camcontrol.8   Tue Jan 21 00:16:41 2014
(r260961)
@@ -207,6 +207,19 @@
 .Op Fl w
 .Op Fl y
 .Nm
+.Ic sanitize
+.Op device id
+.Op generic args
+.Aq Fl a Ar overwrite | block | crypto | exitfailure
+.Op Fl c Ar passes
+.Op Fl I
+.Op Fl P Ar pattern
+.Op Fl q
+.Op Fl U
+.Op Fl r
+.Op Fl w
+.Op Fl y
+.Nm
 .Ic idle
 .Op device id
 .Op generic args
@@ -1088,6 +1101,116 @@ The user
 will not be asked about the timeout if a timeout is specified on the
 command line.
 .El
+.It Ic sanitize
+Issue the
+.Tn SCSI
+SANITIZE command to the named device.
+.Pp
+.Em WARNING! WARNING! WARNING!
+.Pp
+ALL data in the cache and on the disk will be destroyed or made inaccessible.
+Recovery of the data is not possible.
+Use extreme caution when issuing this command.
+.Pp
+The
+.Sq sanitize
+subcommand takes several arguments that modify its default behavior.
+The
+.Fl q
+and
+.Fl y
+arguments can be useful for scripts.
+.Bl -tag -width 6n
+.It Fl a Ar operation
+Specify the sanitize operation to perform.
+.Bl -tag -width 16n
+.It overwrite
+Perform an overwrite operation by writing a user supplied
+data pattern to the device one or more times.
+The pattern is given by the
+.Fl P
+argument.
+The number of times is given by the
+.Fl c
+argument.
+.It block
+Perform a block erase operation.
+All the device's blocks are set to a vendor defined
+value, typically zero.
+.It crypto
+Perform a cryptographic erase operation.
+The encryption keys are changed to prevent the decryption
+of the data.
+.It exitfailure
+Exits a previously failed sanitize operation.
+A failed sanitize operation can only be exited if it was
+run in the unrestricted completion mode, as provided by the
+.Fl U
+argument.
+.El
+.It Fl c Ar passes
+The number of passes when performing an
+.Sq overwrite
+operation.
+Valid values are between 1 and 31. The default is 1.
+.It Fl I
+When performing an
+.Sq overwrite
+operation, the pattern is inverted between consecutive passes.
+.It Fl P Ar pattern
+Path to the file containing the pattern to use when
+performing an
+.Sq overwrite
+operation.
+The pattern is repeated as needed to fill each block.
+.It Fl q
+Be quiet, do not print any status messages.
+This option will not disable
+the questions, however.
+To disable questions, use the
+.Fl y
+argument, below.
+.It Fl U
+Perform the sanitize in the unrestricted completion mode.
+If the operation fails, it can later be exited with the
+.Sq exitfailure
+operation.
+.It Fl r
+Run in
+.Dq report only
+mode.
+This will report status on a sanitize that is already running on the drive.
+.It Fl w
+Issue a non-immediate sanitize command.
+By default,
+.Nm
+issues the SANITIZE command with the immediate bit set.
+This tells the
+device to immediately return the sanitize command, before
+the sanitize has actually completed.
+Then,
+.Nm
+gathers
+.Tn SCSI
+sense information from the device every second to determine how far along
+in the sanitize process it is.
+If the
+.Fl w
+argument is specified,
+.Nm
+will issue a non-immediate sanitize command, and will be unable to print any
+information to let the user know what percentage of the disk has been
+sanitized.
+.It Fl y
+Do not ask any questions.
+By default,
+.Nm
+will ask the user if he/she really wants to sanitize the disk in question,
+and also if the default sanitize command timeout is acceptable.
+The user
+will not be asked about the timeout if a timeout is specified on the
+command line.
+.El
 .It Ic idle
 Put ATA device into IDLE state. Optional parameter
 .Pq Fl t

Modified: stable/9/sbin/camcontrol/camcontrol.c
==
--- stable/9/sbin/camcontrol/camcontrol.c   Tue Jan 21 00:14:06 2014
(r260960)
+++ stable/9/sbin/camcontrol/camcontrol.c   Tue Jan 21 00:16:41 2014
(r260961)
@@ -32,6 +32,7 @@ __FBSDID($FreeBSD$);
 #include sys/ioctl.h
 #include sys/stdint.h
 #include sys/types.h
+#include sys/stat.h
 #include sys/endian.h
 #include sys/sbuf.h
 
@@ -93,7 +94,8 @@ typedef enum {
CAM_CMD_SMP_MANINFO = 0x001b,
CAM_CMD_DOWNLOAD_FW = 0x001c,
CAM_CMD_SECURITY= 0x001d,
-   CAM_CMD_HPA = 

svn commit: r260962 - stable/9/sys/cam/ata

[Alexander Motin]

Author: mav
Date: Tue Jan 21 00:22:08 2014
New Revision: 260962
URL: http://svnweb.freebsd.org/changeset/base/260962

Log:
  MFC r256836:
  Remove hard limit on number of BIOs handled with one ATA TRIM request.

Modified:
  stable/9/sys/cam/ata/ata_da.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cam/ata/ata_da.c
==
--- stable/9/sys/cam/ata/ata_da.c   Tue Jan 21 00:16:41 2014
(r260961)
+++ stable/9/sys/cam/ata/ata_da.c   Tue Jan 21 00:22:08 2014
(r260962)
@@ -124,10 +124,9 @@ struct disk_params {
 
 #define TRIM_MAX_BLOCKS8
 #define TRIM_MAX_RANGES(TRIM_MAX_BLOCKS * ATA_DSM_BLK_RANGES)
-#define TRIM_MAX_BIOS  (TRIM_MAX_RANGES * 4)
 struct trim_request {
uint8_t data[TRIM_MAX_RANGES * ATA_DSM_RANGE_SIZE];
-   struct bio  *bps[TRIM_MAX_BIOS];
+   TAILQ_HEAD(, bio) bps;
 };
 
 struct ada_softc {
@@ -1424,10 +1423,11 @@ adastart(struct cam_periph *periph, unio
struct trim_request *req = softc-trim_req;
struct bio *bp1;
uint64_t lastlba = (uint64_t)-1;
-   int bps = 0, c, lastcount = 0, off, ranges = 0;
+   int c, lastcount = 0, off, ranges = 0;
 
softc-trim_running = 1;
bzero(req, sizeof(*req));
+   TAILQ_INIT(req-bps);
bp1 = bp;
do {
uint64_t lba = bp1-bio_pblkno;
@@ -1470,10 +1470,9 @@ adastart(struct cam_periph *periph, unio
 */
}
lastlba = lba;
-   req-bps[bps++] = bp1;
+   TAILQ_INSERT_TAIL(req-bps, bp1, bio_queue);
bp1 = bioq_first(softc-trim_queue);
-   if (bps = TRIM_MAX_BIOS ||
-   bp1 == NULL ||
+   if (bp1 == NULL ||
bp1-bio_bcount / softc-params.secsize 
(softc-trim_max_ranges - ranges) *
ATA_DSM_RANGE_MAX)
@@ -1762,23 +1761,22 @@ adadone(struct cam_periph *periph, union
if (softc-outstanding_cmds == 0)
softc-flags |= ADA_FLAG_WENT_IDLE;
if (state == ADA_CCB_TRIM) {
-   struct trim_request *req =
-   (struct trim_request *)ataio-data_ptr;
-   int i;
-
-   for (i = 1; i  TRIM_MAX_BIOS  req-bps[i]; i++) {
-   struct bio *bp1 = req-bps[i];
+   TAILQ_HEAD(, bio) queue;
+   struct bio *bp1;
 
-   bp1-bio_error = bp-bio_error;
-   if (bp-bio_flags  BIO_ERROR) {
+   TAILQ_INIT(queue);
+   TAILQ_CONCAT(queue, softc-trim_req.bps, bio_queue);
+   softc-trim_running = 0;
+   while ((bp1 = TAILQ_FIRST(queue)) != NULL) {
+   TAILQ_REMOVE(queue, bp1, bio_queue);
+   bp1-bio_error = error;
+   if (error != 0) {
bp1-bio_flags |= BIO_ERROR;
bp1-bio_resid = bp1-bio_bcount;
} else
bp1-bio_resid = 0;
biodone(bp1);
}
-   softc-trim_running = 0;
-   biodone(bp);
adaschedule(periph);
} else
biodone(bp);
___
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: r260963 - stable/9/sys/cam

[Alexander Motin]

Author: mav
Date: Tue Jan 21 00:25:50 2014
New Revision: 260963
URL: http://svnweb.freebsd.org/changeset/base/260963

Log:
  MFC r256895:
  Fix memory and references leak due to unfreed path.

Modified:
  stable/9/sys/cam/cam_periph.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cam/cam_periph.c
==
--- stable/9/sys/cam/cam_periph.c   Tue Jan 21 00:22:08 2014
(r260962)
+++ stable/9/sys/cam/cam_periph.c   Tue Jan 21 00:25:50 2014
(r260963)
@@ -1786,9 +1786,11 @@ cam_periph_error(union ccb *ccb, cam_fla
scan_ccb-ccb_h.func_code = XPT_SCAN_TGT;
scan_ccb-crcn.flags = 0;
xpt_rescan(scan_ccb);
-   } else
+   } else {
xpt_print(newpath,
Can't allocate CCB to rescan target\n);
+   xpt_free_path(newpath);
+   }
}
}
 
___
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: r260964 - stable/9/sys/cam/ctl

[Alexander Motin]

Author: mav
Date: Tue Jan 21 00:27:49 2014
New Revision: 260964
URL: http://svnweb.freebsd.org/changeset/base/260964

Log:
  MFC r256995:
  Remove 128KB bzero() call done for every block I/O data buffer.

Modified:
  stable/9/sys/cam/ctl/ctl_backend_block.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cam/ctl/ctl_backend_block.c
==
--- stable/9/sys/cam/ctl/ctl_backend_block.cTue Jan 21 00:25:50 2014
(r260963)
+++ stable/9/sys/cam/ctl/ctl_backend_block.cTue Jan 21 00:27:49 2014
(r260964)
@@ -1618,18 +1618,6 @@ ctl_be_block_open(struct ctl_be_block_so
 }
 
 static int
-ctl_be_block_mem_ctor(void *mem, int size, void *arg, int flags)
-{
-   return (0);
-}
-
-static void
-ctl_be_block_mem_dtor(void *mem, int size, void *arg)
-{
-   bzero(mem, size);
-}
-
-static int
 ctl_be_block_create(struct ctl_be_block_softc *softc, struct ctl_lun_req *req)
 {
struct ctl_be_block_lun *be_lun;
@@ -1656,8 +1644,7 @@ ctl_be_block_create(struct ctl_be_block_
mtx_init(be_lun-lock, be_lun-lunname, NULL, MTX_DEF);
 
be_lun-lun_zone = uma_zcreate(be_lun-lunname, MAXPHYS, 
-   ctl_be_block_mem_ctor, ctl_be_block_mem_dtor, NULL, NULL,
-   /*align*/ 0, /*flags*/0);
+   NULL, NULL, NULL, NULL, /*align*/ 0, /*flags*/0);
 
if (be_lun-lun_zone == NULL) {
snprintf(req-error_str, sizeof(req-error_str),
___
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: r260965 - in stable/9/sys/cam: ata scsi

[Alexander Motin]

Author: mav
Date: Tue Jan 21 00:31:31 2014
New Revision: 260965
URL: http://svnweb.freebsd.org/changeset/base/260965

Log:
  MFC r257054:
  Some microoptimizations for da and ada drivers:
   - Replace ordered_tag_count counter with single flag;
   - From da remove outstanding_cmds counter, duplicating pending_ccbs list;
   - From da_softc remove unused links field.

Modified:
  stable/9/sys/cam/ata/ata_da.c
  stable/9/sys/cam/scsi/scsi_da.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cam/ata/ata_da.c
==
--- stable/9/sys/cam/ata/ata_da.c   Tue Jan 21 00:27:49 2014
(r260964)
+++ stable/9/sys/cam/ata/ata_da.c   Tue Jan 21 00:31:31 2014
(r260965)
@@ -81,7 +81,7 @@ typedef enum {
ADA_FLAG_CAN_NCQ= 0x0008,
ADA_FLAG_CAN_DMA= 0x0010,
ADA_FLAG_NEED_OTAG  = 0x0020,
-   ADA_FLAG_WENT_IDLE  = 0x0040,
+   ADA_FLAG_WAS_OTAG   = 0x0040,
ADA_FLAG_CAN_TRIM   = 0x0080,
ADA_FLAG_OPEN   = 0x0100,
ADA_FLAG_SCTX_INIT  = 0x0200,
@@ -132,12 +132,12 @@ struct trim_request {
 struct ada_softc {
struct   bio_queue_head bio_queue;
struct   bio_queue_head trim_queue;
+   int  outstanding_cmds;  /* Number of active commands */
+   int  refcount;  /* Active xpt_action() calls */
ada_state state;
-   ada_flags flags;
+   ada_flags flags;
ada_quirks quirks;
int  sort_io_queue;
-   int  ordered_tag_count;
-   int  outstanding_cmds;
int  trim_max_ranges;
int  trim_running;
int  read_ahead;
@@ -1504,7 +1504,7 @@ adastart(struct cam_periph *periph, unio
if ((bp-bio_flags  BIO_ORDERED) != 0
 || (softc-flags  ADA_FLAG_NEED_OTAG) != 0) {
softc-flags = ~ADA_FLAG_NEED_OTAG;
-   softc-ordered_tag_count++;
+   softc-flags |= ADA_FLAG_WAS_OTAG;
tag_code = 0;
} else {
tag_code = 1;
@@ -1759,7 +1759,7 @@ adadone(struct cam_periph *periph, union
}
softc-outstanding_cmds--;
if (softc-outstanding_cmds == 0)
-   softc-flags |= ADA_FLAG_WENT_IDLE;
+   softc-flags |= ADA_FLAG_WAS_OTAG;
if (state == ADA_CCB_TRIM) {
TAILQ_HEAD(, bio) queue;
struct bio *bp1;
@@ -1923,14 +1923,11 @@ adasendorderedtag(void *arg)
struct ada_softc *softc = arg;
 
if (ada_send_ordered) {
-   if ((softc-ordered_tag_count == 0) 
- ((softc-flags  ADA_FLAG_WENT_IDLE) == 0)) {
-   softc-flags |= ADA_FLAG_NEED_OTAG;
+   if (softc-outstanding_cmds  0) {
+   if ((softc-flags  ADA_FLAG_WAS_OTAG) == 0)
+   softc-flags |= ADA_FLAG_NEED_OTAG;
+   softc-flags = ~ADA_FLAG_WAS_OTAG;
}
-   if (softc-outstanding_cmds  0)
-   softc-flags = ~ADA_FLAG_WENT_IDLE;
-
-   softc-ordered_tag_count = 0;
}
/* Queue us up again */
callout_reset(softc-sendordered_c,

Modified: stable/9/sys/cam/scsi/scsi_da.c
==
--- stable/9/sys/cam/scsi/scsi_da.c Tue Jan 21 00:27:49 2014
(r260964)
+++ stable/9/sys/cam/scsi/scsi_da.c Tue Jan 21 00:31:31 2014
(r260965)
@@ -84,7 +84,7 @@ typedef enum {
DA_FLAG_PACK_LOCKED = 0x004,
DA_FLAG_PACK_REMOVABLE  = 0x008,
DA_FLAG_NEED_OTAG   = 0x020,
-   DA_FLAG_WENT_IDLE   = 0x040,
+   DA_FLAG_WAS_OTAG= 0x040,
DA_FLAG_RETRY_UA= 0x080,
DA_FLAG_OPEN= 0x100,
DA_FLAG_SCTX_INIT   = 0x200,
@@ -199,19 +199,17 @@ struct da_softc {
struct   bio_queue_head bio_queue;
struct   bio_queue_head delete_queue;
struct   bio_queue_head delete_run_queue;
-   SLIST_ENTRY(da_softc) links;
LIST_HEAD(, ccb_hdr) pending_ccbs;
+   int  tur;   /* TEST UNIT READY should be sent */
+   int  refcount;  /* Active xpt_action() calls */
da_state state;
da_flags flags; 
da_quirks quirks;
int  sort_io_queue;
int  minimum_cmd_size;
int  error_inject;
-   int  ordered_tag_count;
-   int  outstanding_cmds;
int  trim_max_ranges;
int  delete_running;
-   int  tur;
int  delete_available;  /* Delete methods possibly available */
uint32_tunmap_max_ranges;
uint32_t

svn commit: r260966 - stable/9/sys/cam/scsi

[Alexander Motin]

Author: mav
Date: Tue Jan 21 00:34:37 2014
New Revision: 260966
URL: http://svnweb.freebsd.org/changeset/base/260966

Log:
  MFC r260407:
  Allow delete_method sysctl to be set to DISABLE.

Modified:
  stable/9/sys/cam/scsi/scsi_da.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cam/scsi/scsi_da.c
==
--- stable/9/sys/cam/scsi/scsi_da.c Tue Jan 21 00:31:31 2014
(r260965)
+++ stable/9/sys/cam/scsi/scsi_da.c Tue Jan 21 00:34:37 2014
(r260966)
@@ -1968,7 +1968,7 @@ dadeletemethodsysctl(SYSCTL_HANDLER_ARGS
char buf[16];
const char *p;
struct da_softc *softc;
-   int i, error, value;
+   int i, error, methods, value;
 
softc = (struct da_softc *)arg1;
 
@@ -1981,8 +1981,9 @@ dadeletemethodsysctl(SYSCTL_HANDLER_ARGS
error = sysctl_handle_string(oidp, buf, sizeof(buf), req);
if (error != 0 || req-newptr == NULL)
return (error);
+   methods = softc-delete_available | (1  DA_DELETE_DISABLE);
for (i = 0; i = DA_DELETE_MAX; i++) {
-   if (!(softc-delete_available  (1  i)) ||
+   if (!(methods  (1  i)) ||
strcmp(buf, da_delete_method_names[i]) != 0)
continue;
dadeletemethodset(softc, i);
___
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: r260969 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Tue Jan 21 01:12:52 2014
New Revision: 260969
URL: http://svnweb.freebsd.org/changeset/base/260969

Log:
  Document r258884.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Tue Jan 21 
01:12:50 2014(r260968)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Tue Jan 21 
01:12:52 2014(r260969)
@@ -239,6 +239,9 @@
 
 para revision=259626Timezone data files have been updated to
   version 2013i./para
+
+para revision=258884man.lldb.1; has been updated to upstream
+  snapshot version r196259./para
   /sect2
 
   sect2 xml:id=ports
___
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: r260967 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Tue Jan 21 01:12:48 2014
New Revision: 260967
URL: http://svnweb.freebsd.org/changeset/base/260967

Log:
  Document r260445.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Tue Jan 21 
00:34:37 2014(r260966)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Tue Jan 21 
01:12:48 2014(r260967)
@@ -234,7 +234,8 @@
   sect2 xml:id=contrib
 titleContributed Software/title
 
-paranbsp;/para
+para revision=260445man.byacc.1; has been updated to version
+  20140101./para
   /sect2
 
   sect2 xml:id=ports
___
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: r260968 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Tue Jan 21 01:12:50 2014
New Revision: 260968
URL: http://svnweb.freebsd.org/changeset/base/260968

Log:
  Document r259626.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Tue Jan 21 
01:12:48 2014(r260967)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Tue Jan 21 
01:12:50 2014(r260968)
@@ -236,6 +236,9 @@
 
 para revision=260445man.byacc.1; has been updated to version
   20140101./para
+
+para revision=259626Timezone data files have been updated to
+  version 2013i./para
   /sect2
 
   sect2 xml:id=ports
___
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: r260970 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Tue Jan 21 01:12:54 2014
New Revision: 260970
URL: http://svnweb.freebsd.org/changeset/base/260970

Log:
  Document r258838.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Tue Jan 21 
01:12:52 2014(r260969)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Tue Jan 21 
01:12:54 2014(r260970)
@@ -224,6 +224,10 @@
   man.dmesg.8; is now printed, opposed to the previous output
   quoteExec format error./quote./para
 
+para revision=258838The man.casperd.8; daemon has been added,
+  which provides access to functionality that is not available in
+  the quotecapability mode/quote sandbox./para
+
 sect3 xml:id=rc-scripts
   titlefilename/etc/rc.d/filename Scripts/title
 
___
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: r260971 - head/release/doc/en_US.ISO8859-1/relnotes

[Glen Barber]

Author: gjb
Date: Tue Jan 21 01:21:20 2014
New Revision: 260971
URL: http://svnweb.freebsd.org/changeset/base/260971

Log:
  Document r258830.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Tue Jan 21 
01:12:54 2014(r260970)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Tue Jan 21 
01:21:20 2014(r260971)
@@ -172,6 +172,10 @@
para revision=260448Support for the intel;
  Centrinotrade; Wireless-N 135 chipset has been
  added./para
+
+   para revision=258830Support for Broadcom chipsets
+ BCM57764, BCM57767, BCM57782, BCM57786 and BCM57787 has
+ been added to man.bge.4;./para
   /sect4
 /sect3
 
___
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: r260972 - in head/sys/amd64/vmm: . io

[Neel Natu]

Author: neel
Date: Tue Jan 21 03:01:34 2014
New Revision: 260972
URL: http://svnweb.freebsd.org/changeset/base/260972

Log:
  There is no need to initialize the IOMMU if no passthru devices have been
  configured for bhyve to use.
  
  Suggested by: grehan@

Modified:
  head/sys/amd64/vmm/io/iommu.c
  head/sys/amd64/vmm/io/ppt.c
  head/sys/amd64/vmm/io/ppt.h
  head/sys/amd64/vmm/vmm.c

Modified: head/sys/amd64/vmm/io/iommu.c
==
--- head/sys/amd64/vmm/io/iommu.c   Tue Jan 21 01:21:20 2014
(r260971)
+++ head/sys/amd64/vmm/io/iommu.c   Tue Jan 21 03:01:34 2014
(r260972)
@@ -33,6 +33,7 @@ __FBSDID($FreeBSD$);
 #include sys/types.h
 #include sys/systm.h
 #include sys/bus.h
+#include sys/sysctl.h
 
 #include dev/pci/pcivar.h
 #include dev/pci/pcireg.h
@@ -43,7 +44,13 @@ __FBSDID($FreeBSD$);
 #include vmm_mem.h
 #include iommu.h
 
-static boolean_t iommu_avail;
+SYSCTL_DECL(_hw_vmm);
+SYSCTL_NODE(_hw_vmm, OID_AUTO, iommu, CTLFLAG_RW, 0, bhyve iommu parameters);
+
+static int iommu_avail;
+SYSCTL_INT(_hw_vmm_iommu, OID_AUTO, initialized, CTLFLAG_RD, iommu_avail,
+0, bhyve iommu initialized?);
+
 static struct iommu_ops *ops;
 static void *host_domain;
 
@@ -160,7 +167,7 @@ iommu_init(void)
if (error)
return;
 
-   iommu_avail = TRUE;
+   iommu_avail = 1;
 
/*
 * Create a domain for the devices owned by the host

Modified: head/sys/amd64/vmm/io/ppt.c
==
--- head/sys/amd64/vmm/io/ppt.c Tue Jan 21 01:21:20 2014(r260971)
+++ head/sys/amd64/vmm/io/ppt.c Tue Jan 21 03:01:34 2014(r260972)
@@ -38,6 +38,7 @@ __FBSDID($FreeBSD$);
 #include sys/pciio.h
 #include sys/rman.h
 #include sys/smp.h
+#include sys/sysctl.h
 
 #include dev/pci/pcivar.h
 #include dev/pci/pcireg.h
@@ -100,7 +101,12 @@ static struct pptdev {
} msix;
 } pptdevs[64];
 
+SYSCTL_DECL(_hw_vmm);
+SYSCTL_NODE(_hw_vmm, OID_AUTO, ppt, CTLFLAG_RW, 0, bhyve passthru devices);
+
 static int num_pptdevs;
+SYSCTL_INT(_hw_vmm_ppt, OID_AUTO, devices, CTLFLAG_RD, num_pptdevs, 0,
+number of pci passthru devices);
 
 static int
 ppt_probe(device_t dev)
@@ -282,7 +288,14 @@ ppt_teardown_msix(struct pptdev *ppt)
 }
 
 int
-ppt_num_devices(struct vm *vm)
+ppt_avail_devices(void)
+{
+
+   return (num_pptdevs);
+}
+
+int
+ppt_assigned_devices(struct vm *vm)
 {
int i, num;
 

Modified: head/sys/amd64/vmm/io/ppt.h
==
--- head/sys/amd64/vmm/io/ppt.h Tue Jan 21 01:21:20 2014(r260971)
+++ head/sys/amd64/vmm/io/ppt.h Tue Jan 21 03:01:34 2014(r260972)
@@ -36,10 +36,16 @@ int ppt_setup_msi(struct vm *vm, int vcp
  uint64_t addr, uint64_t msg, int numvec);
 intppt_setup_msix(struct vm *vm, int vcpu, int bus, int slot, int func,
int idx, uint64_t addr, uint64_t msg, uint32_t vector_control);
-intppt_num_devices(struct vm *vm);
+intppt_assigned_devices(struct vm *vm);
 boolean_t ppt_is_mmio(struct vm *vm, vm_paddr_t gpa);
 
 /*
+ * Returns the number of devices sequestered by the ppt driver for assignment
+ * to virtual machines.
+ */
+intppt_avail_devices(void);
+
+/*
  * The following functions should never be called directly.
  * Use 'vm_assign_pptdev()' and 'vm_unassign_pptdev()' instead.
  */

Modified: head/sys/amd64/vmm/vmm.c
==
--- head/sys/amd64/vmm/vmm.cTue Jan 21 01:21:20 2014(r260971)
+++ head/sys/amd64/vmm/vmm.cTue Jan 21 03:01:34 2014(r260972)
@@ -266,7 +266,8 @@ vmm_handler(module_t mod, int what, void
switch (what) {
case MOD_LOAD:
vmmdev_init();
-   iommu_init();
+   if (ppt_avail_devices()  0)
+   iommu_init();
error = vmm_init();
if (error == 0)
vmm_initialized = 1;
@@ -604,7 +605,7 @@ vm_unassign_pptdev(struct vm *vm, int bu
if (error)
return (error);
 
-   if (ppt_num_devices(vm) == 0) {
+   if (ppt_assigned_devices(vm) == 0) {
vm_iommu_unmap(vm);
vm_gpa_unwire(vm);
}
@@ -624,7 +625,7 @@ vm_assign_pptdev(struct vm *vm, int bus,
 *
 * We need to do this before the first pci passthru device is attached.
 */
-   if (ppt_num_devices(vm) == 0) {
+   if (ppt_assigned_devices(vm) == 0) {
KASSERT(vm-iommu == NULL,
(vm_assign_pptdev: iommu must be NULL));
maxaddr = vmm_mem_maxaddr();
___
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: r260973 - in head/sys/x86: include pci x86

[John Baldwin]

Author: jhb
Date: Tue Jan 21 03:14:19 2014
New Revision: 260973
URL: http://svnweb.freebsd.org/changeset/base/260973

Log:
  - Reuse legacy_pcib_(read|write)_config() methods in the QPI pcib driver.
  - Reuse legacy_pcib_alloc_msi{,x}() methods in the QPI and mptable pcib
drivers.

Modified:
  head/sys/x86/include/legacyvar.h
  head/sys/x86/pci/pci_bus.c
  head/sys/x86/pci/qpi.c
  head/sys/x86/x86/mptable_pci.c

Modified: head/sys/x86/include/legacyvar.h
==
--- head/sys/x86/include/legacyvar.hTue Jan 21 03:01:34 2014
(r260972)
+++ head/sys/x86/include/legacyvar.hTue Jan 21 03:14:19 2014
(r260973)
@@ -57,6 +57,9 @@ int   legacy_pcib_write_ivar(device_t dev,
 uintptr_t value);
 struct resource *legacy_pcib_alloc_resource(device_t dev, device_t child,
 int type, int *rid, u_long start, u_long end, u_long count, u_int flags);
+intlegacy_pcib_alloc_msi(device_t pcib, device_t dev, int count,
+int maxcount, int *irqs);
+intlegacy_pcib_alloc_msix(device_t pcib, device_t dev, int *irq);
 intlegacy_pcib_map_msi(device_t pcib, device_t dev, int irq,
 uint64_t *addr, uint32_t *data);
 

Modified: head/sys/x86/pci/pci_bus.c
==
--- head/sys/x86/pci/pci_bus.c  Tue Jan 21 03:01:34 2014(r260972)
+++ head/sys/x86/pci/pci_bus.c  Tue Jan 21 03:14:19 2014(r260973)
@@ -92,7 +92,7 @@ legacy_pcib_route_interrupt(device_t pci
 
 /* Pass MSI requests up to the nexus. */
 
-static int
+int
 legacy_pcib_alloc_msi(device_t pcib, device_t dev, int count, int maxcount,
 int *irqs)
 {
@@ -103,7 +103,7 @@ legacy_pcib_alloc_msi(device_t pcib, dev
irqs));
 }
 
-static int
+int
 legacy_pcib_alloc_msix(device_t pcib, device_t dev, int *irq)
 {
device_t bus;

Modified: head/sys/x86/pci/qpi.c
==
--- head/sys/x86/pci/qpi.c  Tue Jan 21 03:01:34 2014(r260972)
+++ head/sys/x86/pci/qpi.c  Tue Jan 21 03:14:19 2014(r260973)
@@ -45,8 +45,9 @@ __FBSDID($FreeBSD$);
 
 #include machine/cputypes.h
 #include machine/md_var.h
-#include machine/pci_cfgreg.h
-#include machine/specialreg.h
+#include x86/legacyvar.h
+#include x86/pci_cfgreg.h
+#include x86/specialreg.h
 
 #include dev/pci/pcireg.h
 #include dev/pci/pcivar.h
@@ -237,42 +238,6 @@ qpi_pcib_read_ivar(device_t dev, device_
}
 }
 
-static uint32_t
-qpi_pcib_read_config(device_t dev, u_int bus, u_int slot, u_int func,
-u_int reg, int bytes)
-{
-
-   return (pci_cfgregread(bus, slot, func, reg, bytes));
-}
-
-static void
-qpi_pcib_write_config(device_t dev, u_int bus, u_int slot, u_int func,
-u_int reg, uint32_t data, int bytes)
-{
-
-   pci_cfgregwrite(bus, slot, func, reg, data, bytes);
-}
-
-static int
-qpi_pcib_alloc_msi(device_t pcib, device_t dev, int count, int maxcount,
-int *irqs)
-{
-   device_t bus;
-
-   bus = device_get_parent(pcib);
-   return (PCIB_ALLOC_MSI(device_get_parent(bus), dev, count, maxcount,
-   irqs));
-}
-
-static int
-qpi_pcib_alloc_msix(device_t pcib, device_t dev, int *irq)
-{
-   device_t bus;
-
-   bus = device_get_parent(pcib);
-   return (PCIB_ALLOC_MSIX(device_get_parent(bus), dev, irq));
-}
-
 static int
 qpi_pcib_map_msi(device_t pcib, device_t dev, int irq, uint64_t *addr,
 uint32_t *data)
@@ -302,11 +267,11 @@ static device_method_t qpi_pcib_methods[
 
/* pcib interface */
DEVMETHOD(pcib_maxslots,pcib_maxslots),
-   DEVMETHOD(pcib_read_config, qpi_pcib_read_config),
-   DEVMETHOD(pcib_write_config,qpi_pcib_write_config),
-   DEVMETHOD(pcib_alloc_msi,   qpi_pcib_alloc_msi),
+   DEVMETHOD(pcib_read_config, legacy_pcib_read_config),
+   DEVMETHOD(pcib_write_config,legacy_pcib_write_config),
+   DEVMETHOD(pcib_alloc_msi,   legacy_pcib_alloc_msi),
DEVMETHOD(pcib_release_msi, pcib_release_msi),
-   DEVMETHOD(pcib_alloc_msix,  qpi_pcib_alloc_msix),
+   DEVMETHOD(pcib_alloc_msix,  legacy_pcib_alloc_msix),
DEVMETHOD(pcib_release_msix,pcib_release_msix),
DEVMETHOD(pcib_map_msi, qpi_pcib_map_msi),
 

Modified: head/sys/x86/x86/mptable_pci.c
==
--- head/sys/x86/x86/mptable_pci.c  Tue Jan 21 03:01:34 2014
(r260972)
+++ head/sys/x86/x86/mptable_pci.c  Tue Jan 21 03:14:19 2014
(r260973)
@@ -76,27 +76,6 @@ mptable_hostb_attach(device_t dev)
return (bus_generic_attach(dev));
 }
 
-/* Pass MSI requests up to the nexus. */
-static int
-mptable_hostb_alloc_msi(device_t pcib, device_t dev, int count, int maxcount,
-int *irqs)
-{
-   device_t bus;
-
-   bus = device_get_parent(pcib);
-   return 

svn commit: r260974 - head/sys/kern

[John Baldwin]

Author: jhb
Date: Tue Jan 21 03:24:52 2014
New Revision: 260974
URL: http://svnweb.freebsd.org/changeset/base/260974

Log:
  Fix a typo.

Modified:
  head/sys/kern/vfs_bio.c

Modified: head/sys/kern/vfs_bio.c
==
--- head/sys/kern/vfs_bio.c Tue Jan 21 03:14:19 2014(r260973)
+++ head/sys/kern/vfs_bio.c Tue Jan 21 03:24:52 2014(r260974)
@@ -715,7 +715,7 @@ kern_vfs_bio_buffer_alloc(caddr_t v, lon
}
 
/*
-* Ideal allocation size for the transient bio submap if 10%
+* Ideal allocation size for the transient bio submap is 10%
 * of the maximal space buffer map.  This roughly corresponds
 * to the amount of the buffer mapped for typical UFS load.
 *
___
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: r260975 - head/sys/vm

[John Baldwin]

Author: jhb
Date: Tue Jan 21 03:27:47 2014
New Revision: 260975
URL: http://svnweb.freebsd.org/changeset/base/260975

Log:
  Fix a couple of typos.

Modified:
  head/sys/vm/vm_pageout.c

Modified: head/sys/vm/vm_pageout.c
==
--- head/sys/vm/vm_pageout.cTue Jan 21 03:24:52 2014(r260974)
+++ head/sys/vm/vm_pageout.cTue Jan 21 03:27:47 2014(r260975)
@@ -1121,7 +1121,7 @@ vm_pageout_scan(struct vm_domain *vmd, i
} else if ((m-flags  PG_WINATCFLS) == 0  pass  2) {
/*
 * Dirty pages need to be paged out, but flushing
-* a page is extremely expensive verses freeing
+* a page is extremely expensive versus freeing
 * a clean page.  Rather then artificially limiting
 * the number of pages we can flush, we instead give
 * dirty pages extra priority on the inactive queue
@@ -1183,7 +1183,7 @@ vm_pageout_scan(struct vm_domain *vmd, i
 * to be freed and dirty pages to be moved to the end
 * of the queue.  Since dirty pages are also moved to
 * the end of the queue once-cleaned, this gives
-* way too large a weighting to defering the freeing
+* way too large a weighting to deferring the freeing
 * of dirty pages.
 *
 * We can't wait forever for the vnode lock, we might
___
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: r260976 - head/share/misc

[Glen Barber]

Author: gjb
Date: Tue Jan 21 05:54:14 2014
New Revision: 260976
URL: http://svnweb.freebsd.org/changeset/base/260976

Log:
  Add 10.0-RELEASE.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/share/misc/bsd-family-tree

Modified: head/share/misc/bsd-family-tree
==
--- head/share/misc/bsd-family-tree Tue Jan 21 03:27:47 2014
(r260975)
+++ head/share/misc/bsd-family-tree Tue Jan 21 05:54:14 2014
(r260976)
@@ -291,7 +291,11 @@ FreeBSD 5.2   |  |  
  ||  | |   |
 FreeBSD 10 -current   |  NetBSD -current  OpenBSD -current |
  ||  | |   |
- vv  v v   v
+ |v  v v   v
+ |
+ *--FreeBSD
+ |   10.0
+ v
 
 Time
 
@@ -605,6 +609,7 @@ NetBSD 6.1.22013-09-30 [NBD]
 Mac OS X 10.9  2013-10-22 [APL]
 OpenBSD 5.42013-11-01 [OBD]
 DragonFly 3.6.02013-11-25 [DFB]
+FreeBSD 10.0   2014-01-20 [FBD]
 
 Bibliography
 
___
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: r260977 - head/share/misc

[Glen Barber]

Author: gjb
Date: Tue Jan 21 05:56:35 2014
New Revision: 260977
URL: http://svnweb.freebsd.org/changeset/base/260977

Log:
  Add 11.0-CURRENT.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/share/misc/bsd-family-tree

Modified: head/share/misc/bsd-family-tree
==
--- head/share/misc/bsd-family-tree Tue Jan 21 05:54:14 2014
(r260976)
+++ head/share/misc/bsd-family-tree Tue Jan 21 05:56:35 2014
(r260977)
@@ -289,12 +289,15 @@ FreeBSD 5.2   |  |  
  ||  | |   |
  ||  | |   |
  ||  | |   |
-FreeBSD 10 -current   |  NetBSD -current  OpenBSD -current |
+ ||  NetBSD -current  OpenBSD -current |
  ||  | |   |
  |v  v v   v
  |
  *--FreeBSD
  |   10.0
+ |
+ |
+FreeBSD 11 -current
  v
 
 Time
___
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