svn commit: r295914 - head/contrib/libarchive/libarchive

2016-02-22 Thread Xin LI 
Author: delphij
Date: Tue Feb 23 07:13:22 2016
New Revision: 295914
URL: https://svnweb.freebsd.org/changeset/base/295914

Log:
  MFV r295913:
  
  Partially apply upstream changeset 6e06b1c8 (kientzle).
  
  Limit filter recursion level to 25 (instead of infinite).  This fixes a
  potential crash issue discovered by Alexander Cherepanov.
  
  PR:   207362
  Reported by:  Robert Clausecker
  Obtained from:libarchive github project

Modified:
  head/contrib/libarchive/libarchive/archive_read.c
Directory Properties:
  head/contrib/libarchive/   (props changed)
  head/contrib/libarchive/libarchive/   (props changed)

Modified: head/contrib/libarchive/libarchive/archive_read.c
==
--- head/contrib/libarchive/libarchive/archive_read.c   Tue Feb 23 07:04:54 
2016(r295913)
+++ head/contrib/libarchive/libarchive/archive_read.c   Tue Feb 23 07:13:22 
2016(r295914)
@@ -545,13 +545,13 @@ archive_read_open1(struct archive *_a)
 static int
 choose_filters(struct archive_read *a)
 {
-   int number_bidders, i, bid, best_bid;
+   int number_bidders, i, bid, best_bid, n;
struct archive_read_filter_bidder *bidder, *best_bidder;
struct archive_read_filter *filter;
ssize_t avail;
int r;
 
-   for (;;) {
+   for (n = 0; n < 25; ++n) {
number_bidders = sizeof(a->bidders) / sizeof(a->bidders[0]);
 
best_bid = 0;
@@ -597,6 +597,9 @@ choose_filters(struct archive_read *a)
return (ARCHIVE_FATAL);
}
}
+   archive_set_error(>archive, ARCHIVE_ERRNO_FILE_FORMAT,
+   "Input requires too many filters for decoding");
+   return (ARCHIVE_FATAL);
 }
 
 /*
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

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

2016-02-22 Thread Ian Lepore 
Author: ian
Date: Tue Feb 23 03:34:36 2016
New Revision: 295911
URL: https://svnweb.freebsd.org/changeset/base/295911

Log:
  Stop using the global fdtbus_bs_tag and instead use the tag from the softc
  that was set up properly at init time.

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

Modified: head/sys/dev/uart/uart_dev_lpc.c
==
--- head/sys/dev/uart/uart_dev_lpc.cTue Feb 23 03:01:46 2016
(r295910)
+++ head/sys/dev/uart/uart_dev_lpc.cTue Feb 23 03:34:36 2016
(r295911)
@@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
@@ -49,9 +48,9 @@ __FBSDID("$FreeBSD$");
 static bus_space_handle_t bsh_clkpwr;
 
 #definelpc_ns8250_get_clkreg(_bas, _reg)   \
-bus_space_read_4(fdtbus_bs_tag, bsh_clkpwr, (_reg))
+bus_space_read_4((_bas)->bst, bsh_clkpwr, (_reg))
 #definelpc_ns8250_set_clkreg(_bas, _reg, _val) \
-bus_space_write_4(fdtbus_bs_tag, bsh_clkpwr, (_reg), (_val))
+bus_space_write_4((_bas)->bst, bsh_clkpwr, (_reg), (_val))
 
 /*
  * Clear pending interrupts. THRE is cleared by reading IIR. Data
@@ -292,7 +291,7 @@ lpc_ns8250_init(struct uart_bas *bas, in
u_long  clkmode;

/* Enable UART clock */
-   bus_space_map(fdtbus_bs_tag, LPC_CLKPWR_PHYS_BASE, LPC_CLKPWR_SIZE, 0,
+   bus_space_map(bas->bst, LPC_CLKPWR_PHYS_BASE, LPC_CLKPWR_SIZE, 0,
_clkpwr);
clkmode = lpc_ns8250_get_clkreg(bas, LPC_UART_CLKMODE);
lpc_ns8250_set_clkreg(bas, LPC_UART_CLKMODE, clkmode | 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

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

2016-02-22 Thread Ian Lepore 
Author: ian
Date: Tue Feb 23 03:01:46 2016
New Revision: 295910
URL: https://svnweb.freebsd.org/changeset/base/295910

Log:
  This code no longer references fdtbus_bs_tag, no need for a special extern
  declaration of it for aarch64.

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

Modified: head/sys/dev/uart/uart_cpu_fdt.c
==
--- head/sys/dev/uart/uart_cpu_fdt.cTue Feb 23 02:57:45 2016
(r295909)
+++ head/sys/dev/uart/uart_cpu_fdt.cTue Feb 23 03:01:46 2016
(r295910)
@@ -54,10 +54,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
-#ifdef __aarch64__
-extern bus_space_tag_t fdtbus_bs_tag;
-#endif
-
 /*
  * UART console routines.
  */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

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

2016-02-22 Thread Ian Lepore 
Author: ian
Date: Tue Feb 23 02:57:45 2016
New Revision: 295909
URL: https://svnweb.freebsd.org/changeset/base/295909

Log:
  Now that we have OF_decode_addr(), with proper MD implementations, to obtain
  the bus space tag and handle for a uart console, use the values returned by
  that routine to set the global uart_bus_space_mem, instead of assuming that
  there will be a global variable named fdtbus_bs_tag to set it from.
  
  Also, use OF_getencprop() instead calling fdt32_to_cpu() separately.

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

Modified: head/sys/dev/uart/uart_cpu_fdt.c
==
--- head/sys/dev/uart/uart_cpu_fdt.cTue Feb 23 02:28:19 2016
(r295908)
+++ head/sys/dev/uart/uart_cpu_fdt.cTue Feb 23 02:57:45 2016
(r295909)
@@ -136,9 +136,6 @@ uart_cpu_getdev(int devtype, struct uart
char *cp;
int err;
 
-   uart_bus_space_mem = fdtbus_bs_tag;
-   uart_bus_space_io = NULL;
-
/* Allow overriding the FDT using the environment. */
class = _ns8250_class;
err = uart_getenv(devtype, di, class);
@@ -195,10 +192,8 @@ uart_cpu_getdev(int devtype, struct uart
if (uart_fdt_get_shift(node, ) != 0)
shift = uart_getregshift(class);
 
-   if (OF_getprop(node, "current-speed", , sizeof(br)) <= 0)
+   if (OF_getencprop(node, "current-speed", , sizeof(br)) <= 0)
br = 0;
-   else
-   br = fdt32_to_cpu(br);
 
/*
 * Finalize configuration.
@@ -212,5 +207,9 @@ uart_cpu_getdev(int devtype, struct uart
di->stopbits = 1;
di->parity = UART_PARITY_NONE;
 
-   return (OF_decode_addr(node, 0, >bas.bst, >bas.bsh, NULL));
+   err = OF_decode_addr(node, 0, >bas.bst, >bas.bsh, NULL);
+   uart_bus_space_mem = di->bas.bst;
+   uart_bus_space_io = NULL;
+
+   return (err);
 }
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r295908 - head/sys/powerpc/mpc85xx

2016-02-22 Thread Justin Hibbits 
Author: jhibbits
Date: Tue Feb 23 02:28:19 2016
New Revision: 295908
URL: https://svnweb.freebsd.org/changeset/base/295908

Log:
  Allow the size argument for law_enable() to be non-power-of-2.
  
  Although the local access windows are powers of 2 in size, allow arguments 
that
  aren't power of 2, and round up.

Modified:
  head/sys/powerpc/mpc85xx/mpc85xx.c

Modified: head/sys/powerpc/mpc85xx/mpc85xx.c
==
--- head/sys/powerpc/mpc85xx/mpc85xx.c  Tue Feb 23 01:56:58 2016
(r295907)
+++ head/sys/powerpc/mpc85xx/mpc85xx.c  Tue Feb 23 02:28:19 2016
(r295908)
@@ -157,7 +157,8 @@ law_find_free(void)
return (i);
 }
 
-#define_LAW_SR(trgt,size)  (0x8000 | (trgt << 20) | 
(ffsl(size) - 2))
+#define_LAW_SR(trgt,size)  (0x8000 | (trgt << 20) | \
+   (flsl(size + (size - 1)) - 2))
 
 int
 law_enable(int trgt, uint64_t bar, uint32_t size)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r295907 - in head/sys/dev/usb: . wlan

2016-02-22 Thread Kevin Lo 
Author: kevlo
Date: Tue Feb 23 01:56:58 2016
New Revision: 295907
URL: https://svnweb.freebsd.org/changeset/base/295907

Log:
  Add device ID for 'AboCom 802.11n' usb.
  
  PR:   207412
  Submitted by: Philippe Michaud-Boudreault 

Modified:
  head/sys/dev/usb/usbdevs
  head/sys/dev/usb/wlan/if_urtwn.c

Modified: head/sys/dev/usb/usbdevs
==
--- head/sys/dev/usb/usbdevsTue Feb 23 01:19:26 2016(r295906)
+++ head/sys/dev/usb/usbdevsTue Feb 23 01:56:58 2016(r295907)
@@ -835,6 +835,7 @@ product ABOCOM RT2573_4 0xb21e  RT2573
 product ABOCOM RTL8188CU_1 0x8188  RTL8188CU
 product ABOCOM RTL8188CU_2 0x8189  RTL8188CU
 product ABOCOM RTL8192CU   0x8178  RTL8192CU
+product ABOCOM RTL8188EU   0x8179  RTL8188EU
 product ABOCOM WUG2700 0xb21f  WUG2700
 
 /* Acton Research Corp. */

Modified: head/sys/dev/usb/wlan/if_urtwn.c
==
--- head/sys/dev/usb/wlan/if_urtwn.cTue Feb 23 01:19:26 2016
(r295906)
+++ head/sys/dev/usb/wlan/if_urtwn.cTue Feb 23 01:56:58 2016
(r295907)
@@ -176,6 +176,7 @@ static const STRUCT_USB_HOST_ID urtwn_de
URTWN_DEV(TRENDNET, RTL8192CU),
URTWN_DEV(ZYXEL,RTL8192CU),
/* URTWN_RTL8188E */
+   URTWN_RTL8188E_DEV(ABOCOM,  RTL8188EU),
URTWN_RTL8188E_DEV(DLINK,   DWA123D1),
URTWN_RTL8188E_DEV(DLINK,   DWA125D1),
URTWN_RTL8188E_DEV(ELECOM,  WDC150SU2M),
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r295906 - head/sys/dev/e1000

2016-02-22 Thread Marius Strobl 
Author: marius
Date: Tue Feb 23 01:19:26 2016
New Revision: 295906
URL: https://svnweb.freebsd.org/changeset/base/295906

Log:
  Fix and clean up usage of DMA and TSO segments:
  - At Intel it is believed that most of their products support "only"
40 DMA segments so lower {EM,IGB}_MAX_SCATTER accordingly. Actually,
40 is more than plenty to handle full size TSO packets so it doesn't
make sense to further distinguish between MAC variants that really
can do 64 DMA segments. Moreover, capping at 40 DMA segments limits
the stack usage of {em,igb}_xmit() that - given the rare use of more
than these - previously hardly was justifiable, while still being
sufficient to avoid the problems seen with em(4) and EM_MAX_SCATTER
set to 32.
  - In igb(4), pass the actually supported TSO parameters up the stack.
Previously, the defaults set in if_attach_internal() were applied,
i. e. a maximum of 35 TSO segments, which made supporting more than
these in the driver pointless. However, this might explain why no
problems were seen with IGB_MAX_SCATTER at 64.
  - In em(4), take the 5 m_pullup(9) invocations performed by em_xmit()
in the TSO case into account when reporting TSO parameters upwards.
In the worst case, each of these calls will add another mbuf and,
thus, the requirement for an additional DMA segment. So for best
performance, it doesn't make sense to advertize a maximum of TSO
segments that typically will require defragmentation in em_xmit().
Again, this leaves enough room to handle full size TSO packets.
  - Drop TSO macros from if_lem.h given that corresponding MACS don't
support TSO in the first place.
  
  Reviewed by:  erj, sbruno, jeffrey.e.pieper_intel.com
  Approved by:  erj
  MFC after:3 days
  Differential Revision:https://reviews.freebsd.org/D5238

Modified:
  head/sys/dev/e1000/if_em.c
  head/sys/dev/e1000/if_em.h
  head/sys/dev/e1000/if_igb.c
  head/sys/dev/e1000/if_igb.h
  head/sys/dev/e1000/if_lem.h

Modified: head/sys/dev/e1000/if_em.c
==
--- head/sys/dev/e1000/if_em.c  Tue Feb 23 01:09:35 2016(r295905)
+++ head/sys/dev/e1000/if_em.c  Tue Feb 23 01:19:26 2016(r295906)
@@ -3193,9 +3193,11 @@ em_setup_interface(device_t dev, struct 
if_setflags(ifp, IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST);
if_setioctlfn(ifp, em_ioctl);
if_setgetcounterfn(ifp, em_get_counter);
+
/* TSO parameters */
ifp->if_hw_tsomax = IP_MAXPACKET;
-   ifp->if_hw_tsomaxsegcount = EM_MAX_SCATTER;
+   /* Take m_pullup(9)'s in em_xmit() w/ TSO into acount. */
+   ifp->if_hw_tsomaxsegcount = EM_MAX_SCATTER - 5;
ifp->if_hw_tsomaxsegsize = EM_TSO_SEG_SIZE;
 
 #ifdef EM_MULTIQUEUE

Modified: head/sys/dev/e1000/if_em.h
==
--- head/sys/dev/e1000/if_em.h  Tue Feb 23 01:09:35 2016(r295905)
+++ head/sys/dev/e1000/if_em.h  Tue Feb 23 01:19:26 2016(r295906)
@@ -269,7 +269,7 @@
 #define HW_DEBUGOUT1(S, A)  if (DEBUG_HW) printf(S "\n", A)
 #define HW_DEBUGOUT2(S, A, B)   if (DEBUG_HW) printf(S "\n", A, B)
 
-#define EM_MAX_SCATTER 64
+#define EM_MAX_SCATTER 40
 #define EM_VFTA_SIZE   128
 #define EM_TSO_SIZE(65535 + sizeof(struct ether_vlan_header))
 #define EM_TSO_SEG_SIZE4096/* Max dma segment size */

Modified: head/sys/dev/e1000/if_igb.c
==
--- head/sys/dev/e1000/if_igb.c Tue Feb 23 01:09:35 2016(r295905)
+++ head/sys/dev/e1000/if_igb.c Tue Feb 23 01:19:26 2016(r295906)
@@ -3139,6 +3139,12 @@ igb_setup_interface(device_t dev, struct
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_ioctl = igb_ioctl;
ifp->if_get_counter = igb_get_counter;
+
+   /* TSO parameters */
+   ifp->if_hw_tsomax = IP_MAXPACKET;
+   ifp->if_hw_tsomaxsegcount = IGB_MAX_SCATTER;
+   ifp->if_hw_tsomaxsegsize = IGB_TSO_SEG_SIZE;
+
 #ifndef IGB_LEGACY_TX
ifp->if_transmit = igb_mq_start;
ifp->if_qflush = igb_qflush;

Modified: head/sys/dev/e1000/if_igb.h
==
--- head/sys/dev/e1000/if_igb.h Tue Feb 23 01:09:35 2016(r295905)
+++ head/sys/dev/e1000/if_igb.h Tue Feb 23 01:19:26 2016(r295906)
@@ -278,7 +278,7 @@
 #define HW_DEBUGOUT1(S, A)  if (DEBUG_HW) printf(S "\n", A)
 #define HW_DEBUGOUT2(S, A, B)   if (DEBUG_HW) printf(S "\n", A, B)
 
-#define IGB_MAX_SCATTER64
+#define IGB_MAX_SCATTER40
 #define IGB_VFTA_SIZE  128
 #define IGB_BR_SIZE4096/* ring buf size */
 #define IGB_TSO_SIZE   (65535 + sizeof(struct ether_vlan_header))

Modified:

svn commit: r295904 - head/sys/arm/freescale/imx

2016-02-22 Thread Ian Lepore 
Author: ian
Date: Tue Feb 23 01:08:39 2016
New Revision: 295904
URL: https://svnweb.freebsd.org/changeset/base/295904

Log:
  Make imx6 systems work again after recent import of new dts files.
  
  Linux-driven changes to the way the chip's two interrupt controllers are
  defined (we only support one of them) led to no interrupt processing, so
  the system would hang after device instantiation.  This workaround just
  rewrites the FDT data on the fly to get interrupt handling back under the
  control of the main GIC device.
  
  If/when we ever support deep sleep modes that involve powering down the
  main GIC, we'll have to undo this change, write a driver for the GPC-PIC,
  and somehow manage the handoff of responsibilities between the two drivers
  as the chip transitions in/out of deep sleep mode.

Modified:
  head/sys/arm/freescale/imx/imx6_machdep.c

Modified: head/sys/arm/freescale/imx/imx6_machdep.c
==
--- head/sys/arm/freescale/imx/imx6_machdep.c   Tue Feb 23 00:45:27 2016
(r295903)
+++ head/sys/arm/freescale/imx/imx6_machdep.c   Tue Feb 23 01:08:39 2016
(r295904)
@@ -94,6 +94,74 @@ fdt_pic_decode_t fdt_pic_table[] = {
 };
 #endif
 
+/*
+ * Fix FDT data related to interrupts.
+ *
+ * Driven by the needs of linux and its drivers (as always), the published FDT
+ * data for imx6 now sets the interrupt parent for most devices to the GPC
+ * interrupt controller, which is for use when the chip is in deep-sleep mode.
+ * We don't support deep sleep or have a GPC-PIC driver; we need all interrupts
+ * to be handled by the GIC.
+ *
+ * Luckily, the change to the FDT data was to assign the GPC as the interrupt
+ * parent for the soc node and letting that get inherited by all other devices
+ * (except a few that directly name GIC as their interrupt parent).  So we can
+ * set the world right by just changing the interrupt-parent property of the 
soc
+ * node to refer to GIC instead of GPC.  This will get us by until we write our
+ * own GPC driver (or until linux changes its mind and the FDT data again).
+ *
+ * We validate that we have data that looks like we expect before changing it:
+ *  - SOC node exists and has GPC as its interrupt parent.
+ *  - GPC node exists and has GIC as its interrupt parent.
+ *  - GIC node exists and is its own interrupt parent.
+ *
+ * This applies to all models of imx6.  Luckily all of them have the devices
+ * involved at the same addresses on the same busses, so we don't need any
+ * per-soc logic.  We handle this at platform attach time rather than via the
+ * fdt_fixup_table, because the latter requires matching on the FDT "model"
+ * property, and this applies to all boards including those not yet invented.
+ */
+static void
+fix_fdt_interrupt_data(void)
+{
+   phandle_t gicipar, gicnode, gicxref;
+   phandle_t gpcipar, gpcnode, gpcxref;
+   phandle_t socipar, socnode;
+   int result;
+
+   socnode = OF_finddevice("/soc");
+   if (socnode == -1)
+   return;
+   result = OF_getencprop(socnode, "interrupt-parent", ,
+   sizeof(socipar));
+   if (result <= 0)
+   return;
+
+   gicnode = OF_finddevice("/soc/interrupt-controller@00a01000");
+   if (gicnode == -1)
+   return;
+   result = OF_getencprop(gicnode, "interrupt-parent", ,
+   sizeof(gicipar));
+   if (result <= 0)
+   return;
+   gicxref = OF_xref_from_node(gicnode);
+
+   gpcnode = OF_finddevice("/soc/aips-bus@0200/gpc@020dc000");
+   if (gpcnode == -1)
+   return;
+   result = OF_getencprop(gpcnode, "interrupt-parent", ,
+   sizeof(gpcipar));
+   if (result <= 0)
+   return;
+   gpcxref = OF_xref_from_node(gpcnode);
+
+   if (socipar != gpcxref || gpcipar != gicxref || gicipar != gicxref)
+   return;
+
+   gicxref = cpu_to_fdt32(gicxref);
+   OF_setprop(socnode, "interrupt-parent", , sizeof(gicxref));
+}
+
 static vm_offset_t
 imx6_lastaddr(platform_t plat)
 {
@@ -104,6 +172,10 @@ imx6_lastaddr(platform_t plat)
 static int
 imx6_attach(platform_t plat)
 {
+
+   /* Fix soc interrupt-parent property. */
+   fix_fdt_interrupt_data();
+
/* Inform the MPCore timer driver that its clock is variable. */
arm_tmr_change_frequency(ARM_TMR_FREQUENCY_VARIES);
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r295768 - head/usr.sbin/iostat

2016-02-22 Thread Dimitry Andric 
On 22 Feb 2016, at 10:56, David Chisnall  wrote:
> 
> On 19 Feb 2016, at 23:23, Dimitry Andric  wrote:
>> 
>> This warning is only produced when you use -Wall -W, and then initialize
>> structs partially, i.e. you initialize some fields but not others.  I
>> think this is a quite reasonable warning for a high warning level.
> 
> The warning is annoying in many ways.  You ought to be able to zero 
> initialise any struct with {0}, but clang objects if you do this and requires 
> every field to be filled in.  This warning really shouldn’t be enabled with 
> -Wall, because it has too hight a false positive rate.

It isn't, it is in -W (a.k.a -Wextra).  But gcc also warns in this case.  E.g. 
if I use this example:

struct foo {
int i;
int j;
} bar[] = {
{ 42 },
{ 43 }
};

I get the following warnings from gcc -Wextra:

$ gcc -Wextra -c initializers.c
initializers.c:5:2: warning: missing initializer for field 'j' of 'struct foo' 
[-Wmissing-field-initializers]
  { 42 },
  ^
initializers.c:3:6: note: 'j' declared here
  int j;
  ^
initializers.c:6:2: warning: missing initializer for field 'j' of 'struct foo' 
[-Wmissing-field-initializers]
  { 43 }
  ^
initializers.c:3:6: note: 'j' declared here
  int j;
  ^

Note that the warnings disappear if C99 initializers are used.

-Dimitry



signature.asc
Description: Message signed with OpenPGP using GPGMail

svn commit: r295901 - head/contrib/binutils/bfd

2016-02-22 Thread Dimitry Andric 
Author: dim
Date: Mon Feb 22 22:16:32 2016
New Revision: 295901
URL: https://svnweb.freebsd.org/changeset/base/295901

Log:
  Fix a problem in ld, causing it to sometimes print messages similar to
  "invalid string offset 65521 >= 27261 for section `.strtab'". for object
  files produced by recent versions of clang.
  
  In BFD's elf_create_symbuf() function, the size of the symbol buffer
  ('ssymbuf') is not calculated correctly, and the initial value for the
  'ssym' variable is off by one, since 'ssymbuf' has shndx_count + 1
  members.
  
  MFC after:1 week

Modified:
  head/contrib/binutils/bfd/elf.c

Modified: head/contrib/binutils/bfd/elf.c
==
--- head/contrib/binutils/bfd/elf.c Mon Feb 22 21:40:53 2016
(r295900)
+++ head/contrib/binutils/bfd/elf.c Mon Feb 22 22:16:32 2016
(r295901)
@@ -8934,14 +8934,14 @@ elf_create_symbuf (bfd_size_type symcoun
shndx_count++;
 
   ssymbuf = bfd_malloc ((shndx_count + 1) * sizeof (*ssymbuf)
-   + (indbufend - indbuf) * sizeof (*ssymbuf));
+   + (indbufend - indbuf) * sizeof (*ssym));
   if (ssymbuf == NULL)
 {
   free (indbuf);
   return NULL;
 }
 
-  ssym = (struct elf_symbuf_symbol *) (ssymbuf + shndx_count);
+  ssym = (struct elf_symbuf_symbol *) (ssymbuf + shndx_count + 1);
   ssymbuf->ssym = NULL;
   ssymbuf->count = shndx_count;
   ssymbuf->st_shndx = 0;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r295900 - head/usr.sbin/iostat

2016-02-22 Thread Alan Somers 
Author: asomers
Date: Mon Feb 22 21:40:53 2016
New Revision: 295900
URL: https://svnweb.freebsd.org/changeset/base/295900

Log:
  Fix the usr.sbin/iostat build with GCC, broken by r295768
  
  Renamed some local variables for compatibility with -Wshadow
  
  Reported by:  Andrew Turner
  Tested by:ken
  MFC after:4 weeks
  X-MFC-with:   295768
  Sponsored by: Spectra Logic Corp

Modified:
  head/usr.sbin/iostat/iostat.c

Modified: head/usr.sbin/iostat/iostat.c
==
--- head/usr.sbin/iostat/iostat.c   Mon Feb 22 21:01:25 2016
(r295899)
+++ head/usr.sbin/iostat/iostat.c   Mon Feb 22 21:40:53 2016
(r295900)
@@ -797,7 +797,7 @@ devstats(int perf_select, long double et
long double total_mb, blocks_per_second, total_duration;
long double ms_per_other, ms_per_read, ms_per_write, ms_per_transaction;
int firstline = 1;
-   char *devname;
+   char *devicename;
 
if (xflag > 0) {
printf("extended device statistics  ");
@@ -871,7 +871,7 @@ devstats(int perf_select, long double et
}
 
if (xflag > 0) {
-   if (asprintf(, "%s%d",
+   if (asprintf(, "%s%d",
cur.dinfo->devices[di].device_name,
cur.dinfo->devices[di].unit_number) == -1)
err(1, "asprintf");
@@ -887,7 +887,7 @@ devstats(int perf_select, long double et
printf("%-8.8s %5d %5d %8.1Lf "
"%8.1Lf %5d %5d %5d %5d "
"%4" PRIu64 " %3.0Lf ",
-   devname,
+   devicename,
(int)transfers_per_second_read,
(int)transfers_per_second_write,
mb_per_second_read * 1024,
@@ -900,7 +900,7 @@ devstats(int perf_select, long double et
printf("%-8.8s %11.1Lf %11.1Lf "
"%12.1Lf %12.1Lf %4" PRIu64
" %10.1Lf %9.1Lf ",
-   devname,
+   devicename,
(long double)total_transfers_read,
(long double)total_transfers_write,
(long double)
@@ -925,7 +925,7 @@ devstats(int perf_select, long double et
}
printf("\n");
}
-   free(devname);
+   free(devicename);
} else if (oflag > 0) {
int msdig = (ms_per_transaction < 100.0) ? 1 : 0;
 
@@ -979,15 +979,15 @@ static void
 cpustats(void)
 {
int state;
-   double time;
+   double cptime;
 
-   time = 0.0;
+   cptime = 0.0;
 
for (state = 0; state < CPUSTATES; ++state)
-   time += cur.cp_time[state];
+   cptime += cur.cp_time[state];
for (state = 0; state < CPUSTATES; ++state)
printf(" %2.0f",
-  rint(100. * cur.cp_time[state] / (time ? time : 1)));
+  rint(100. * cur.cp_time[state] / (cptime ? cptime : 1)));
 }
 
 static int
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r295899 - head/sys/conf

2016-02-22 Thread Bryan Drewery 
Author: bdrewery
Date: Mon Feb 22 21:01:25 2016
New Revision: 295899
URL: https://svnweb.freebsd.org/changeset/base/295899

Log:
  Always remove .depend.* in case switching between FAST_DEPEND on/off.
  
  This was missed in r295666.
  
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/conf/kern.post.mk

Modified: head/sys/conf/kern.post.mk
==
--- head/sys/conf/kern.post.mk  Mon Feb 22 20:20:10 2016(r295898)
+++ head/sys/conf/kern.post.mk  Mon Feb 22 21:01:25 2016(r295899)
@@ -222,10 +222,9 @@ _MKDEPCC:= ${CC:N${CCACHE_BIN}}
 SRCS=  assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \
${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
${MFILES:T:S/.m$/.h/}
-DEPENDFILES=   .depend
+DEPENDFILES=   .depend .depend.*
 .if ${MK_FAST_DEPEND} == "yes" && \
 (${.MAKE.MODE:Unormal:Mmeta} == "" || ${.MAKE.MODE:Unormal:Mnofilemon} != 
"")
-DEPENDFILES+=  .depend.*
 DEPEND_CFLAGS+=-MD -MP -MF.depend.${.TARGET}
 DEPEND_CFLAGS+=-MT${.TARGET}
 .if defined(.PARSEDIR)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r295768 - head/usr.sbin/iostat

2016-02-22 Thread Gleb Smirnoff 
On Fri, Feb 19, 2016 at 04:50:40PM -0800, Conrad Meyer wrote:
C> > It is not quite as simple as this would make it sound.  The elements or
C> > members of an aggregate (e.g.) structure type are initialized as if it were
C> > an object of static storage duration (i.e., to zero) if the initializer 
list
C> > does not contain enough initializers for all members of the aggregate type,
C> > per item 21 of section 6.7.8 of n1256.pdf.  However, such initialization
C> > does not necessarily need to zero any padding bytes that are present, which
C> > may take unspecified values.  Personally, I think this particular clang
C> > warning can be too aggressive, especially for complex structs, but on the
C> > other hand given the indeterminateness of padding, bzero/memset are often a
C> > better choice anyway.
C> 
C> By definition, padding byte contents are unused.  There is no reason
C> their values matter one way or another, so why do we care about the
C> distinction between bzero and member zero initialization?

Well, one can run bcmp() or a hashing function over entire structure,
in that case contents of padding matter.

But I still don't want to see this warning in -Wall, since it kills
very useful C99 initializers.

The code, that runs bcmp() or hashes over structs, should take care, and
we shouldn't pessimize the entire build for its sake.

-- 
Totus tuus, Glebius.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r295895 - head/sys/boot/uboot/lib

2016-02-22 Thread Ian Lepore 
Author: ian
Date: Mon Feb 22 18:53:55 2016
New Revision: 295895
URL: https://svnweb.freebsd.org/changeset/base/295895

Log:
  If the user has set a u-boot env var named rootpath, automatically
  import it into the loader(8) env as dhcp.root-path, so that it overrides
  any dhcp/bootp server-provided path.
  
  Now if you have a dhcp server available you can easily net-boot a u-boot
  system even if you don't control the dhcp server config, by setting just
  two variables in the u-boot env:
  
loaderdev=net
rootpath=:
  
  Previously you had to either accept all the dhcp parameters from the
  server without the ability to locally provide the rootpath, or you had
  to forego dhcp and set more vars (ipaddr, netmask, serverip, rootpath).

Modified:
  head/sys/boot/uboot/lib/net.c

Modified: head/sys/boot/uboot/lib/net.c
==
--- head/sys/boot/uboot/lib/net.c   Mon Feb 22 17:18:36 2016
(r295894)
+++ head/sys/boot/uboot/lib/net.c   Mon Feb 22 18:53:55 2016
(r295895)
@@ -108,9 +108,19 @@ get_env_net_params()
char *envstr;
in_addr_t rootaddr, serveraddr;
 
-   /* Silently get out right away if we don't have rootpath. */
-   if (ub_env_get("rootpath") == NULL)
+   /*
+* Silently get out right away if we don't have rootpath, because none
+* of the other info we obtain below is sufficient to boot without it.
+*
+* If we do have rootpath, copy it into the global var and also set
+* dhcp.root-path in the env.  If we don't get all the other info from
+* the u-boot env below, we will still try dhcp/bootp, but the server-
+* provided path will not replace the user-provided value we set here.
+*/
+   if ((envstr = ub_env_get("rootpath")) == NULL)
return;
+   strlcpy(rootpath, envstr, sizeof(rootpath));
+   setenv("dhcp.root-path", rootpath, 0);
 
/*
 * Our own IP address must be valid.  Silently get out if it's not set,
@@ -154,9 +164,6 @@ get_env_net_params()
 * There must be a rootpath.  It may be ip:/path or it may be just the
 * path in which case the ip needs to be in serverip.
 */
-   if ((envstr = ub_env_get("rootpath")) == NULL)
-   return;
-   strncpy(rootpath, envstr, sizeof(rootpath) - 1);
rootaddr = net_parse_rootpath();
if (rootaddr == INADDR_NONE)
rootaddr = serveraddr;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r295890 - in head/sys: conf riscv/riscv

2016-02-22 Thread Andrew Turner 
On Mon, 22 Feb 2016 14:01:46 + (UTC)
Ruslan Bukin  wrote:

> Author: br
> Date: Mon Feb 22 14:01:46 2016
> New Revision: 295890
> URL: https://svnweb.freebsd.org/changeset/base/295890
> 
> Log:
>   Provide stack(9) MD stubs for RISC-V so ktr(9) can be compiled in.
> 
> Added:
>   head/sys/riscv/riscv/stack_machdep.c   (contents, props changed)
> Modified:
>   head/sys/conf/files.riscv
> 
> Modified: head/sys/conf/files.riscv
> ==
> --- head/sys/conf/files.riscv Mon Feb 22 13:52:08 2016
> (r295889) +++ head/sys/conf/files.riscv   Mon Feb 22 14:01:46
> 2016  (r295890) @@ -34,9 +34,10 @@
> riscv/riscv/machdep.c standard
> riscv/riscv/mem.c standard
> riscv/riscv/nexus.c   standard
> riscv/riscv/pmap.cstandard
> -riscv/riscv/sys_machdep.cstandard
> +riscv/riscv/stack_machdep.c  standard

This is to "optional ddb | stack" on other architectures.

Andrew
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r295893 - head/sys/riscv/riscv

2016-02-22 Thread Ruslan Bukin 
Author: br
Date: Mon Feb 22 14:54:50 2016
New Revision: 295893
URL: https://svnweb.freebsd.org/changeset/base/295893

Log:
  Add basic trap handlers for illegal instruction and breakpoint
  exceptions.

Modified:
  head/sys/riscv/riscv/trap.c

Modified: head/sys/riscv/riscv/trap.c
==
--- head/sys/riscv/riscv/trap.c Mon Feb 22 14:19:45 2016(r295892)
+++ head/sys/riscv/riscv/trap.c Mon Feb 22 14:54:50 2016(r295893)
@@ -270,6 +270,17 @@ do_trap_supervisor(struct trapframe *fra
case EXCP_INSTR_ACCESS_FAULT:
data_abort(frame, 0);
break;
+   case EXCP_INSTR_BREAKPOINT:
+#ifdef KDB
+   kdb_trap(exception, 0, frame);
+#else
+   dump_regs(frame);
+   panic("No debugger in kernel.\n");
+#endif
+   case EXCP_INSTR_ILLEGAL:
+   dump_regs(frame);
+   panic("Illegal instruction at %x\n", frame->tf_sepc);
+   break;
default:
dump_regs(frame);
panic("Unknown kernel exception %x badaddr %lx\n",
@@ -281,6 +292,10 @@ void
 do_trap_user(struct trapframe *frame)
 {
uint64_t exception;
+   struct thread *td;
+
+   td = curthread;
+   td->td_frame = frame;
 
exception = (frame->tf_scause & EXCP_MASK);
if (frame->tf_scause & EXCP_INTR) {
@@ -302,6 +317,14 @@ do_trap_user(struct trapframe *frame)
frame->tf_sepc += 4;/* Next instruction */
svc_handler(frame);
break;
+   case EXCP_INSTR_ILLEGAL:
+   call_trapsignal(td, SIGILL, ILL_ILLTRP, (void *)frame->tf_sepc);
+   userret(td, frame);
+   break;
+   case EXCP_INSTR_BREAKPOINT:
+   call_trapsignal(td, SIGTRAP, TRAP_BRKPT, (void 
*)frame->tf_sepc);
+   userret(td, frame);
+   break;
default:
dump_regs(frame);
panic("Unknown userland exception %x badaddr %lx\n",
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r295892 - head/sys/riscv/riscv

2016-02-22 Thread Ruslan Bukin 
Author: br
Date: Mon Feb 22 14:19:45 2016
New Revision: 295892
URL: https://svnweb.freebsd.org/changeset/base/295892

Log:
  Fix comment.

Modified:
  head/sys/riscv/riscv/timer.c

Modified: head/sys/riscv/riscv/timer.c
==
--- head/sys/riscv/riscv/timer.cMon Feb 22 14:13:05 2016
(r295891)
+++ head/sys/riscv/riscv/timer.cMon Feb 22 14:19:45 2016
(r295892)
@@ -145,8 +145,9 @@ riscv_tmr_intr(void *arg)
 
/*
 * Clear interrupt pending bit.
-* Note sip register is unimplemented in Spike simulator,
-* so use machine command to clear in mip.
+* Note: SIP_STIP bit is not implemented in sip register
+* in Spike simulator, so use machine command to clear
+* interrupt pending bit in mip.
 */
machine_command(ECALL_CLEAR_PENDING, 0);
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r295891 - head/sys/riscv/include

2016-02-22 Thread Ruslan Bukin 
Author: br
Date: Mon Feb 22 14:13:05 2016
New Revision: 295891
URL: https://svnweb.freebsd.org/changeset/base/295891

Log:
  Remove duplicates.

Modified:
  head/sys/riscv/include/atomic.h

Modified: head/sys/riscv/include/atomic.h
==
--- head/sys/riscv/include/atomic.h Mon Feb 22 14:01:46 2016
(r295890)
+++ head/sys/riscv/include/atomic.h Mon Feb 22 14:13:05 2016
(r295891)
@@ -399,10 +399,6 @@ atomic_store_rel_64(volatile uint64_t *p
*p = val;
 }
 
-#defineatomic_add_acq_int  atomic_add_acq_32
-#defineatomic_clear_acq_intatomic_clear_acq_32
-#defineatomic_cmpset_acq_int   atomic_cmpset_acq_32
-
 #defineatomic_add_acq_long atomic_add_acq_64
 #defineatomic_clear_acq_long   atomic_add_acq_64
 #defineatomic_cmpset_acq_long  atomic_cmpset_acq_64
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r295890 - in head/sys: conf riscv/riscv

2016-02-22 Thread Ruslan Bukin 
Author: br
Date: Mon Feb 22 14:01:46 2016
New Revision: 295890
URL: https://svnweb.freebsd.org/changeset/base/295890

Log:
  Provide stack(9) MD stubs for RISC-V so ktr(9) can be compiled in.

Added:
  head/sys/riscv/riscv/stack_machdep.c   (contents, props changed)
Modified:
  head/sys/conf/files.riscv

Modified: head/sys/conf/files.riscv
==
--- head/sys/conf/files.riscv   Mon Feb 22 13:52:08 2016(r295889)
+++ head/sys/conf/files.riscv   Mon Feb 22 14:01:46 2016(r295890)
@@ -34,9 +34,10 @@ riscv/riscv/machdep.cstandard
 riscv/riscv/mem.c  standard
 riscv/riscv/nexus.cstandard
 riscv/riscv/pmap.c standard
-riscv/riscv/sys_machdep.c  standard
+riscv/riscv/stack_machdep.cstandard
 riscv/riscv/support.S  standard
 riscv/riscv/swtch.Sstandard
+riscv/riscv/sys_machdep.c  standard
 riscv/riscv/trap.c standard
 riscv/riscv/timer.cstandard
 riscv/riscv/uio_machdep.c  standard

Added: head/sys/riscv/riscv/stack_machdep.c
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/riscv/riscv/stack_machdep.cMon Feb 22 14:01:46 2016
(r295890)
@@ -0,0 +1,63 @@
+/*-
+ * Copyright (c) 2016 Ruslan Bukin 
+ * All rights reserved.
+ *
+ * Portions of this software were developed by SRI International and the
+ * University of Cambridge Computer Laboratory under DARPA/AFRL contract
+ * FA8750-10-C-0237 ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * Portions of this software were developed by the University of Cambridge
+ * Computer Laboratory as part of the CTSRD Project, with support from the
+ * UK Higher Education Innovation Fund (HEIF).
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include 
+__FBSDID("$FreeBSD$");
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+void
+stack_save_td(struct stack *st, struct thread *td)
+{
+
+}
+
+int
+stack_save_td_running(struct stack *st, struct thread *td)
+{
+
+   return (EOPNOTSUPP);
+}
+
+void
+stack_save(struct stack *st)
+{
+
+}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r295889 - head/sys/riscv/riscv

2016-02-22 Thread Ruslan Bukin 
Author: br
Date: Mon Feb 22 13:52:08 2016
New Revision: 295889
URL: https://svnweb.freebsd.org/changeset/base/295889

Log:
  Fix ktrace call.

Modified:
  head/sys/riscv/riscv/machdep.c

Modified: head/sys/riscv/riscv/machdep.c
==
--- head/sys/riscv/riscv/machdep.c  Mon Feb 22 13:34:43 2016
(r295888)
+++ head/sys/riscv/riscv/machdep.c  Mon Feb 22 13:52:08 2016
(r295889)
@@ -555,7 +555,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, 
tf->tf_ra = (register_t)(sysent->sv_psstrings -
*(sysent->sv_szsigcode));
 
-   CTR3(KTR_SIG, "sendsig: return td=%p pc=%#x sp=%#x", td, tf->tf_elr,
+   CTR3(KTR_SIG, "sendsig: return td=%p pc=%#x sp=%#x", td, tf->tf_sepc,
tf->tf_sp);
 
PROC_LOCK(p);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r295888 - head/sys/arm64/conf

2016-02-22 Thread Wojciech Macek 
Author: wma
Date: Mon Feb 22 13:34:43 2016
New Revision: 295888
URL: https://svnweb.freebsd.org/changeset/base/295888

Log:
  Add Intel 10Gb support to ARM64 GENERIC kernel config
  
  Obtained from: Semihalf
  Sponsored by:  Cavium
  Approved by:   cognet (mentor)
  Reviewed by:   zbb
  Differential revision: https://reviews.freebsd.org/D5347

Modified:
  head/sys/arm64/conf/GENERIC

Modified: head/sys/arm64/conf/GENERIC
==
--- head/sys/arm64/conf/GENERIC Mon Feb 22 12:57:08 2016(r295887)
+++ head/sys/arm64/conf/GENERIC Mon Feb 22 13:34:43 2016(r295888)
@@ -103,6 +103,7 @@ device  mii
 device miibus  # MII bus support
 device em  # Intel PRO/1000 Gigabit Ethernet Family
 device igb # Intel PRO/1000 PCIE Server Gigabit Family
+device ix  # Intel 10Gb Ethernet Family
 device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
 device vnic# Cavium ThunderX NIC
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r295887 - head/sys/arm/arm

2016-02-22 Thread Svatopluk Kraus 
Author: skra
Date: Mon Feb 22 12:57:08 2016
New Revision: 295887
URL: https://svnweb.freebsd.org/changeset/base/295887

Log:
  Remove armv6 specific part from armv4 specific file and update comment.
  No functional change.

Modified:
  head/sys/arm/arm/trap-v4.c

Modified: head/sys/arm/arm/trap-v4.c
==
--- head/sys/arm/arm/trap-v4.c  Mon Feb 22 12:28:23 2016(r295886)
+++ head/sys/arm/arm/trap-v4.c  Mon Feb 22 12:57:08 2016(r295887)
@@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
-#include 
 #include 
 #include 
 #include 
@@ -312,16 +311,13 @@ abort_handler(struct trapframe *tf, int 
}
 
/*
-* We need to know whether the page should be mapped as R or R/W.  On
-* armv6 and later the fault status register indicates whether the
-* access was a read or write.  Prior to armv6, we know that a
-* permission fault can only be the result of a write to a read-only
-* location, so we can deal with those quickly.  Otherwise we need to
-* disassemble the faulting instruction to determine if it was a write.
+* We need to know whether the page should be mapped as R or R/W.
+* On armv4, the fault status register does not indicate whether
+* the access was a read or write.  We know that a permission fault
+* can only be the result of a write to a read-only location, so we
+* can deal with those quickly.  Otherwise we need to disassemble
+* the faulting instruction to determine if it was a write.
 */
-#if __ARM_ARCH >= 6
-   ftype = (fsr & FAULT_WNR) ? VM_PROT_READ | VM_PROT_WRITE : VM_PROT_READ;
-#else
if (IS_PERMISSION_FAULT(fsr))
ftype = VM_PROT_WRITE;
else {
@@ -338,7 +334,6 @@ abort_handler(struct trapframe *tf, int 
ftype = VM_PROT_READ;
}
}
-#endif
 
/*
 * See if the fault is as a result of ref/mod emulation,
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r295885 - in head/sys/arm: allwinner allwinner/a20 altera/socfpga amlogic/aml8726 annapurna/alpine broadcom/bcm2835 conf freescale/imx freescale/vybrid mv/armadaxp qemu rockchip samsung...

2016-02-22 Thread Svatopluk Kraus 
Author: skra
Date: Mon Feb 22 11:47:28 2016
New Revision: 295885
URL: https://svnweb.freebsd.org/changeset/base/295885

Log:
  Move ARM_L2_PIPT option to std.armv6 for all armv6 platforms.
  Only L2 PIPT cache is supported for __ARM_ARCH >= 6.
  
  In fact, this is just a pure proclamation as this option is used
  only in armv4 specific files now.

Modified:
  head/sys/arm/allwinner/a20/std.a20
  head/sys/arm/allwinner/std.a10
  head/sys/arm/altera/socfpga/std.socfpga
  head/sys/arm/amlogic/aml8726/std.aml8726
  head/sys/arm/annapurna/alpine/std.alpine
  head/sys/arm/broadcom/bcm2835/std.bcm2836
  head/sys/arm/conf/std.armv6
  head/sys/arm/freescale/imx/std.imx51
  head/sys/arm/freescale/imx/std.imx53
  head/sys/arm/freescale/imx/std.imx6
  head/sys/arm/freescale/vybrid/std.vybrid
  head/sys/arm/mv/armadaxp/std.armadaxp
  head/sys/arm/qemu/std.virt
  head/sys/arm/rockchip/std.rk30xx
  head/sys/arm/samsung/exynos/std.exynos5250
  head/sys/arm/samsung/exynos/std.exynos5420
  head/sys/arm/ti/am335x/std.am335x
  head/sys/arm/ti/omap4/std.omap4
  head/sys/arm/xilinx/std.zynq7

Modified: head/sys/arm/allwinner/a20/std.a20
==
--- head/sys/arm/allwinner/a20/std.a20  Mon Feb 22 09:49:45 2016
(r295884)
+++ head/sys/arm/allwinner/a20/std.a20  Mon Feb 22 11:47:28 2016
(r295885)
@@ -8,8 +8,6 @@ makeoptions CONF_CFLAGS="-march=armv7a"
 makeoptionsKERNVIRTADDR=0xc020
 optionsKERNVIRTADDR=0xc020
 
-optionsARM_L2_PIPT
-
 optionsIPI_IRQ_START=0
 optionsIPI_IRQ_END=15
 

Modified: head/sys/arm/allwinner/std.a10
==
--- head/sys/arm/allwinner/std.a10  Mon Feb 22 09:49:45 2016
(r295884)
+++ head/sys/arm/allwinner/std.a10  Mon Feb 22 11:47:28 2016
(r295885)
@@ -8,7 +8,5 @@ makeoptions CONF_CFLAGS="-march=armv7a"
 makeoptionsKERNVIRTADDR=0xc020
 optionsKERNVIRTADDR=0xc020
 
-optionsARM_L2_PIPT
-
 files  "../allwinner/files.allwinner"
 files  "../allwinner/files.a10"

Modified: head/sys/arm/altera/socfpga/std.socfpga
==
--- head/sys/arm/altera/socfpga/std.socfpga Mon Feb 22 09:49:45 2016
(r295884)
+++ head/sys/arm/altera/socfpga/std.socfpga Mon Feb 22 11:47:28 2016
(r295885)
@@ -7,8 +7,6 @@ makeoptions CONF_CFLAGS="-march=armv7a"
 makeoptionsKERNVIRTADDR=0xc0f0
 optionsKERNVIRTADDR=0xc0f0
 
-optionsARM_L2_PIPT
-
 optionsIPI_IRQ_START=0
 optionsIPI_IRQ_END=15
 

Modified: head/sys/arm/amlogic/aml8726/std.aml8726
==
--- head/sys/arm/amlogic/aml8726/std.aml8726Mon Feb 22 09:49:45 2016
(r295884)
+++ head/sys/arm/amlogic/aml8726/std.aml8726Mon Feb 22 11:47:28 2016
(r295885)
@@ -17,8 +17,6 @@ devicefdt_pinctrl
 
 files  "../amlogic/aml8726/files.aml8726"
 
-optionsARM_L2_PIPT
-
 # Set all global interrupts to be edge triggered, active high.
 optionsGIC_DEFAULT_ICFGR_INIT=0x
 

Modified: head/sys/arm/annapurna/alpine/std.alpine
==
--- head/sys/arm/annapurna/alpine/std.alpineMon Feb 22 09:49:45 2016
(r295884)
+++ head/sys/arm/annapurna/alpine/std.alpineMon Feb 22 11:47:28 2016
(r295885)
@@ -10,8 +10,6 @@ options   KERNVIRTADDR=0xa020
 makeoptionsKERNBASE=0xa000
 optionsKERNBASE=0xa000
 
-optionsARM_L2_PIPT
-
 optionsIPI_IRQ_START=0
 optionsIPI_IRQ_END=15
 

Modified: head/sys/arm/broadcom/bcm2835/std.bcm2836
==
--- head/sys/arm/broadcom/bcm2835/std.bcm2836   Mon Feb 22 09:49:45 2016
(r295884)
+++ head/sys/arm/broadcom/bcm2835/std.bcm2836   Mon Feb 22 11:47:28 2016
(r295885)
@@ -5,7 +5,6 @@ cpu CPU_CORTEXA
 makeoptionsCONF_CFLAGS="-march=armv7a"
 optionsSOC_BCM2836
 
-optionsARM_L2_PIPT
 optionsIPI_IRQ_START=76
 
 files  "../broadcom/bcm2835/files.bcm2836"

Modified: head/sys/arm/conf/std.armv6
==
--- head/sys/arm/conf/std.armv6 Mon Feb 22 09:49:45 2016(r295884)
+++ head/sys/arm/conf/std.armv6 Mon Feb 22 11:47:28 2016(r295885)
@@ -2,6 +2,8 @@
 #
 # $FreeBSD$
 
+optionsARM_L2_PIPT # Only L2 PIPT is supported
+
 optionsPREEMPTION  # Enable kernel thread preemption
 optionsINET# InterNETworking
 optionsINET6   # IPv6 communications protocols

Modified:

Re: svn commit: r295768 - head/usr.sbin/iostat

2016-02-22 Thread David Chisnall 
On 22 Feb 2016, at 10:15, Kubilay Kocak  wrote:
> 
> For the lay persons among us (I'm genuinely interested), what are the
> the downsides to requiring initialization of all fields?

Explicit initialisation, or initialisation in general?

Being able to initialise the entire structure with code that will always 
initialise everything with zero makes the code less fragile because you can add 
a field to the structure and not have to find all of the places where it’s 
initialised.  The clang warning makes it easy to find the places you need to 
change, but now you have code churn for no good reason.

Implicit initialisation is often useful for generating more efficient code.  If 
you’re intialising with a bunch of common fields, the compiler will end up 
creating a static variable and doing a memcpy (which the back end may 
optimise), which is very cheap.  A load of code in libc ends up like this.

> And in addition, the upsides, if any, of 'deferred' field initialization?

The same as the upsides for deferred variable initialization.  Modern compilers 
are good at tracking intraprocedural data flow.  If you don’t initialise a 
field, then the compiler can typically tell that you’ve read from a field but 
not written to it.  It’s generally good defensive programming for zero to have 
a well-defined meaning (C codifies this for pointers, Go codifies it for all 
structure types), but if you haven’t done this then the zero may be a valid but 
incorrect value and no amount of static analysis can tell you that the 
programmer did something that is valid but wrong.  Some languages with richer 
type systems explicitly encode the invalidity of the variable in its type and 
transform it to the valid version once it is initialised (some also provide 
maybe types as a programmer-level constructs.  You can implement them fairly 
trivially in C++, see for example LLVM’s ErrorOr<> template).

Sane coding style for C (not style(9)) typically includes the principle of 
minimum scope, where variables must be declared as close to possible their 
initialisation.  This helps minimise these problems, because you either declare 
the variable where it is initialised, or (if initialisation is conditional) 
right next to it where you can clearly see that it has been initialised on all 
code paths.  Unfortunately, as you can see from the PVS results, style(9) could 
have been carefully designed to maximise the introduction of accidental bugs.

David

___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r295768 - head/usr.sbin/iostat

2016-02-22 Thread Kubilay Kocak 
On 22/02/2016 8:56 PM, David Chisnall wrote:
> On 19 Feb 2016, at 23:23, Dimitry Andric  wrote:
>> 
>> This warning is only produced when you use -Wall -W, and then
>> initialize structs partially, i.e. you initialize some fields but
>> not others.  I think this is a quite reasonable warning for a high
>> warning level.
> 
> The warning is annoying in many ways.  You ought to be able to zero
> initialise any struct with {0}, but clang objects if you do this and
> requires every field to be filled in.  This warning really shouldn’t
> be enabled with -Wall, because it has too hight a false positive
> rate.

For the lay persons among us (I'm genuinely interested), what are the
the downsides to requiring initialization of all fields?

And in addition, the upsides, if any, of 'deferred' field initialization?

Is there a proper term for the above?

> With regard to Bruce’s comment about padding, this is a known issue
> in C11.  There is an open DR about it and it’s scheduled for
> discussion at the WG14 meeting in London in April.
> 
> David
> 

Koobs
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r295768 - head/usr.sbin/iostat

2016-02-22 Thread David Chisnall 
On 19 Feb 2016, at 23:23, Dimitry Andric  wrote:
> 
> This warning is only produced when you use -Wall -W, and then initialize
> structs partially, i.e. you initialize some fields but not others.  I
> think this is a quite reasonable warning for a high warning level.

The warning is annoying in many ways.  You ought to be able to zero initialise 
any struct with {0}, but clang objects if you do this and requires every field 
to be filled in.  This warning really shouldn’t be enabled with -Wall, because 
it has too hight a false positive rate.

With regard to Bruce’s comment about padding, this is a known issue in C11.  
There is an open DR about it and it’s scheduled for discussion at the WG14 
meeting in London in April.

David

___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r295883 - in head/sys: amd64/vmm arm/mv dev/altera/avgen dev/vt/hw/efifb

2016-02-22 Thread Svatopluk Kraus 
Author: skra
Date: Mon Feb 22 09:10:23 2016
New Revision: 295883
URL: https://svnweb.freebsd.org/changeset/base/295883

Log:
  As  is included from , there is no need to
  include it explicitly when  is already included.
  
  Reviewed by:  alc, kib
  Differential Revision:https://reviews.freebsd.org/D5380

Modified:
  head/sys/amd64/vmm/vmm.c
  head/sys/arm/mv/mvvar.h
  head/sys/dev/altera/avgen/altera_avgen.c
  head/sys/dev/altera/avgen/altera_avgen_fdt.c
  head/sys/dev/altera/avgen/altera_avgen_nexus.c
  head/sys/dev/vt/hw/efifb/efifb.c

Modified: head/sys/amd64/vmm/vmm.c
==
--- head/sys/amd64/vmm/vmm.cMon Feb 22 09:08:04 2016(r295882)
+++ head/sys/amd64/vmm/vmm.cMon Feb 22 09:10:23 2016(r295883)
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
 #include 
 
 #include 
-#include 
 #include 
 #include 
 #include 

Modified: head/sys/arm/mv/mvvar.h
==
--- head/sys/arm/mv/mvvar.h Mon Feb 22 09:08:04 2016(r295882)
+++ head/sys/arm/mv/mvvar.h Mon Feb 22 09:10:23 2016(r295883)
@@ -44,7 +44,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 

Modified: head/sys/dev/altera/avgen/altera_avgen.c
==
--- head/sys/dev/altera/avgen/altera_avgen.cMon Feb 22 09:08:04 2016
(r295882)
+++ head/sys/dev/altera/avgen/altera_avgen.cMon Feb 22 09:10:23 2016
(r295883)
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 
 #include 
 #include 
-#include 
 
 #include 
 

Modified: head/sys/dev/altera/avgen/altera_avgen_fdt.c
==
--- head/sys/dev/altera/avgen/altera_avgen_fdt.cMon Feb 22 09:08:04 
2016(r295882)
+++ head/sys/dev/altera/avgen/altera_avgen_fdt.cMon Feb 22 09:10:23 
2016(r295883)
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 
 #include 
 #include 
-#include 
 
 #include 
 

Modified: head/sys/dev/altera/avgen/altera_avgen_nexus.c
==
--- head/sys/dev/altera/avgen/altera_avgen_nexus.c  Mon Feb 22 09:08:04 
2016(r295882)
+++ head/sys/dev/altera/avgen/altera_avgen_nexus.c  Mon Feb 22 09:10:23 
2016(r295883)
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 
 #include 
 #include 
-#include 
 
 #include 
 

Modified: head/sys/dev/vt/hw/efifb/efifb.c
==
--- head/sys/dev/vt/hw/efifb/efifb.cMon Feb 22 09:08:04 2016
(r295882)
+++ head/sys/dev/vt/hw/efifb/efifb.cMon Feb 22 09:10:23 2016
(r295883)
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_platform.h"
 
 #include 
-#include 
 #include 
 #include 
 #include 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r295882 - in head/sys: amd64/amd64 amd64/vmm arm/arm arm64/arm64 cddl/dev/dtrace/aarch64 cddl/dev/dtrace/arm cddl/dev/dtrace/mips compat/linux compat/svr4 dev/hyperv/netvsc riscv/riscv

2016-02-22 Thread Svatopluk Kraus 
Author: skra
Date: Mon Feb 22 09:08:04 2016
New Revision: 295882
URL: https://svnweb.freebsd.org/changeset/base/295882

Log:
  As  is included from , there is no
  need to include it explicitly when  is already included.
  
  Suggested by: alc
  Reviewed by:  alc
  Differential Revision:https://reviews.freebsd.org/D5379

Modified:
  head/sys/amd64/amd64/minidump_machdep.c
  head/sys/amd64/vmm/vmm.c
  head/sys/arm/arm/genassym.c
  head/sys/arm/arm/pmap-v6.c
  head/sys/arm/arm/trap-v6.c
  head/sys/arm64/arm64/minidump_machdep.c
  head/sys/arm64/arm64/trap.c
  head/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c
  head/sys/cddl/dev/dtrace/arm/dtrace_isa.c
  head/sys/cddl/dev/dtrace/mips/dtrace_isa.c
  head/sys/compat/linux/linux_util.h
  head/sys/compat/svr4/svr4_misc.c
  head/sys/compat/svr4/svr4_util.h
  head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  head/sys/riscv/riscv/genassym.c
  head/sys/riscv/riscv/minidump_machdep.c
  head/sys/riscv/riscv/trap.c

Modified: head/sys/amd64/amd64/minidump_machdep.c
==
--- head/sys/amd64/amd64/minidump_machdep.c Mon Feb 22 09:04:36 2016
(r295881)
+++ head/sys/amd64/amd64/minidump_machdep.c Mon Feb 22 09:08:04 2016
(r295882)
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 #include 
 
 CTASSERT(sizeof(struct kerneldumpheader) == 512);

Modified: head/sys/amd64/vmm/vmm.c
==
--- head/sys/amd64/vmm/vmm.cMon Feb 22 09:04:36 2016(r295881)
+++ head/sys/amd64/vmm/vmm.cMon Feb 22 09:08:04 2016(r295882)
@@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 

Modified: head/sys/arm/arm/genassym.c
==
--- head/sys/arm/arm/genassym.c Mon Feb 22 09:04:36 2016(r295881)
+++ head/sys/arm/arm/genassym.c Mon Feb 22 09:08:04 2016(r295882)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include 
 
 #include 
-#include 
 #include 
 #include 
 #include 

Modified: head/sys/arm/arm/pmap-v6.c
==
--- head/sys/arm/arm/pmap-v6.c  Mon Feb 22 09:04:36 2016(r295881)
+++ head/sys/arm/arm/pmap-v6.c  Mon Feb 22 09:08:04 2016(r295882)
@@ -121,7 +121,6 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #include 
-#include 
 
 #include 
 #include 

Modified: head/sys/arm/arm/trap-v6.c
==
--- head/sys/arm/arm/trap-v6.c  Mon Feb 22 09:04:36 2016(r295881)
+++ head/sys/arm/arm/trap-v6.c  Mon Feb 22 09:08:04 2016(r295882)
@@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 
 #ifdef KDB
 #include 

Modified: head/sys/arm64/arm64/minidump_machdep.c
==
--- head/sys/arm64/arm64/minidump_machdep.c Mon Feb 22 09:04:36 2016
(r295881)
+++ head/sys/arm64/arm64/minidump_machdep.c Mon Feb 22 09:08:04 2016
(r295882)
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
 
 #include 
 #include 
-#include 
 #include 
 
 CTASSERT(sizeof(struct kerneldumpheader) == 512);

Modified: head/sys/arm64/arm64/trap.c
==
--- head/sys/arm64/arm64/trap.c Mon Feb 22 09:04:36 2016(r295881)
+++ head/sys/arm64/arm64/trap.c Mon Feb 22 09:08:04 2016(r295882)
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 
 #ifdef KDTRACE_HOOKS
 #include 

Modified: head/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c
==
--- head/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c   Mon Feb 22 09:04:36 
2016(r295881)
+++ head/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c   Mon Feb 22 09:08:04 
2016(r295882)
@@ -44,7 +44,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

Modified: head/sys/cddl/dev/dtrace/arm/dtrace_isa.c
==
--- head/sys/cddl/dev/dtrace/arm/dtrace_isa.c   Mon Feb 22 09:04:36 2016
(r295881)
+++ head/sys/cddl/dev/dtrace/arm/dtrace_isa.c   Mon Feb 22 09:08:04 2016
(r295882)
@@ -44,7 +44,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

Modified: head/sys/cddl/dev/dtrace/mips/dtrace_isa.c
==
--- head/sys/cddl/dev/dtrace/mips/dtrace_isa.c  Mon Feb 22 09:04:36 2016
(r295881)
+++ head/sys/cddl/dev/dtrace/mips/dtrace_isa.c  Mon Feb 22 09:08:04 2016
(r295882)
@@ -44,7 +44,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include

svn commit: r295881 - in head: lib/libvmmapi share/man/man9 sys/arm/arm sys/arm64/arm64 sys/dev/drm sys/dev/drm2 sys/mips/mips sys/mips/nlm sys/mips/nlm/dev/net sys/mips/rmi sys/mips/rmi/dev/nlge

2016-02-22 Thread Svatopluk Kraus 
Author: skra
Date: Mon Feb 22 09:04:36 2016
New Revision: 295881
URL: https://svnweb.freebsd.org/changeset/base/295881

Log:
  As  is included from , there is no need
  to include it explicitly when  is already included.
  
  Reviewed by:  alc, kib
  Differential Revision:https://reviews.freebsd.org/D5378

Modified:
  head/lib/libvmmapi/vmmapi.c
  head/share/man/man9/bios.9
  head/sys/arm/arm/debug_monitor.c
  head/sys/arm64/arm64/debug_monitor.c
  head/sys/dev/drm/drmP.h
  head/sys/dev/drm2/drmP.h
  head/sys/mips/mips/stack_machdep.c
  head/sys/mips/nlm/cms.c
  head/sys/mips/nlm/dev/net/xlpge.c
  head/sys/mips/rmi/dev/nlge/if_nlge.c
  head/sys/mips/rmi/fmn.c
  head/sys/mips/rmi/iodi.c

Modified: head/lib/libvmmapi/vmmapi.c
==
--- head/lib/libvmmapi/vmmapi.c Mon Feb 22 09:02:20 2016(r295880)
+++ head/lib/libvmmapi/vmmapi.c Mon Feb 22 09:04:36 2016(r295881)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 
 #include 
 #include 
-#include 
 
 #include 
 #include 

Modified: head/share/man/man9/bios.9
==
--- head/share/man/man9/bios.9  Mon Feb 22 09:02:20 2016(r295880)
+++ head/share/man/man9/bios.9  Mon Feb 22 09:04:36 2016(r295881)
@@ -37,7 +37,6 @@
 .In sys/param.h
 .In vm/vm.h
 .In vm/pmap.h
-.In machine/param.h
 .In machine/pc/bios.h
 .Ft uint32_t
 .Fn bios_sigsearch "uint32_t start" "u_char *sig" "int siglen" "int paralen" 
"int sigofs"

Modified: head/sys/arm/arm/debug_monitor.c
==
--- head/sys/arm/arm/debug_monitor.cMon Feb 22 09:02:20 2016
(r295880)
+++ head/sys/arm/arm/debug_monitor.cMon Feb 22 09:04:36 2016
(r295881)
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 

Modified: head/sys/arm64/arm64/debug_monitor.c
==
--- head/sys/arm64/arm64/debug_monitor.cMon Feb 22 09:02:20 2016
(r295880)
+++ head/sys/arm64/arm64/debug_monitor.cMon Feb 22 09:04:36 2016
(r295881)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 

Modified: head/sys/dev/drm/drmP.h
==
--- head/sys/dev/drm/drmP.h Mon Feb 22 09:02:20 2016(r295880)
+++ head/sys/dev/drm/drmP.h Mon Feb 22 09:04:36 2016(r295881)
@@ -75,7 +75,6 @@ struct drm_file;
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #if defined(__i386__) || defined(__amd64__)

Modified: head/sys/dev/drm2/drmP.h
==
--- head/sys/dev/drm2/drmP.hMon Feb 22 09:02:20 2016(r295880)
+++ head/sys/dev/drm2/drmP.hMon Feb 22 09:04:36 2016(r295881)
@@ -76,7 +76,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #if defined(__i386__) || defined(__amd64__)

Modified: head/sys/mips/mips/stack_machdep.c
==
--- head/sys/mips/mips/stack_machdep.c  Mon Feb 22 09:02:20 2016
(r295880)
+++ head/sys/mips/mips/stack_machdep.c  Mon Feb 22 09:04:36 2016
(r295881)
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
 
 #include 
 
-#include 
 #include 
 #include 
 

Modified: head/sys/mips/nlm/cms.c
==
--- head/sys/mips/nlm/cms.c Mon Feb 22 09:02:20 2016(r295880)
+++ head/sys/mips/nlm/cms.c Mon Feb 22 09:04:36 2016(r295881)
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 

Modified: head/sys/mips/nlm/dev/net/xlpge.c
==
--- head/sys/mips/nlm/dev/net/xlpge.c   Mon Feb 22 09:02:20 2016
(r295880)
+++ head/sys/mips/nlm/dev/net/xlpge.c   Mon Feb 22 09:04:36 2016
(r295881)
@@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
-#include 
 #include 
 #include  /* for DELAY */
 #include 

Modified: head/sys/mips/rmi/dev/nlge/if_nlge.c
==
--- head/sys/mips/rmi/dev/nlge/if_nlge.cMon Feb 22 09:02:20 2016
(r295880)
+++ head/sys/mips/rmi/dev/nlge/if_nlge.cMon Feb 22 09:04:36 2016
(r295881)
@@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 #include 
-#include 
 #include 
 #include  /* for DELAY */
 #include 

Modified: head/sys/mips/rmi/fmn.c
==
--- head/sys/mips/rmi/fmn.c Mon Feb 22 09:02:20 2016(r295880)
+++

svn commit: r295880 - in head: share/man/man9 sys/amd64/cloudabi64 sys/amd64/vmm/amd sys/arm/annapurna/alpine sys/arm/arm sys/arm64/arm64 sys/arm64/cloudabi64 sys/compat/linuxkpi/common/include/lin...

2016-02-22 Thread Svatopluk Kraus 
Author: skra
Date: Mon Feb 22 09:02:20 2016
New Revision: 295880
URL: https://svnweb.freebsd.org/changeset/base/295880

Log:
  As  is included from , there is no need to
  include it explicitly when  is already included.
  
  Reviewed by:  alc, kib
  Differential Revision:https://reviews.freebsd.org/D5373

Modified:
  head/share/man/man9/bios.9
  head/sys/amd64/cloudabi64/cloudabi64_sysvec.c
  head/sys/amd64/vmm/amd/npt.c
  head/sys/amd64/vmm/amd/svm.c
  head/sys/arm/annapurna/alpine/alpine_machdep.c
  head/sys/arm/arm/mp_machdep.c
  head/sys/arm64/arm64/minidump_machdep.c
  head/sys/arm64/cloudabi64/cloudabi64_sysvec.c
  head/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
  head/sys/compat/linuxkpi/common/include/linux/list.h
  head/sys/compat/linuxkpi/common/src/linux_compat.c
  head/sys/compat/linuxkpi/common/src/linux_pci.c
  head/sys/dev/ce/if_ce.c
  head/sys/dev/cp/if_cp.c
  head/sys/dev/drm/drmP.h
  head/sys/dev/drm2/drmP.h
  head/sys/dev/fb/machfb.c
  head/sys/dev/isci/isci_oem_parameters.c
  head/sys/dev/ntb/if_ntb/if_ntb.c
  head/sys/dev/ntb/ntb_hw/ntb_hw.c
  head/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
  head/sys/dev/rt/if_rt.c
  head/sys/dev/siba/siba_pcib.c
  head/sys/dev/vt/hw/efifb/efifb.c
  head/sys/i386/bios/mca_machdep.c
  head/sys/i386/pci/pci_cfgreg.c
  head/sys/mips/adm5120/admpci.c
  head/sys/mips/atheros/ar71xx_fixup.c
  head/sys/mips/atheros/ar71xx_pci.c
  head/sys/mips/atheros/ar71xx_spi.c
  head/sys/mips/atheros/ar724x_pci.c
  head/sys/mips/atheros/if_arge.c
  head/sys/mips/atheros/qca955x_pci.c
  head/sys/mips/cavium/cvmx_config.h
  head/sys/mips/cavium/octopci.c
  head/sys/mips/idt/idtpci.c
  head/sys/mips/malta/gt_pci.c
  head/sys/mips/mips/minidump_machdep.c
  head/sys/mips/mips/nexus.c
  head/sys/mips/nlm/xlp_simplebus.c
  head/sys/mips/rt305x/rt305x_pci.c
  head/sys/mips/sibyte/sb_zbpci.c
  head/sys/powerpc/aim/slb.c
  head/sys/powerpc/ofw/ofw_real.c
  head/sys/powerpc/ofw/rtas.c
  head/sys/powerpc/powermac/macgpio.c
  head/sys/powerpc/powermac/macio.c
  head/sys/powerpc/powermac/platform_powermac.c
  head/sys/powerpc/powerpc/genassym.c
  head/sys/powerpc/powerpc/trap.c
  head/sys/powerpc/ps3/if_glc.c
  head/sys/powerpc/ps3/platform_ps3.c
  head/sys/powerpc/ps3/ps3_syscons.c
  head/sys/powerpc/ps3/ps3bus.c
  head/sys/powerpc/ps3/ps3cdrom.c
  head/sys/powerpc/ps3/ps3disk.c
  head/sys/powerpc/pseries/platform_chrp.c
  head/sys/powerpc/psim/iobus.c
  head/sys/sparc64/pci/fire.c
  head/sys/sparc64/sparc64/iommu.c
  head/sys/sparc64/sparc64/tlb.c
  head/sys/x86/acpica/acpi_wakeup.c
  head/sys/x86/x86/nexus.c

Modified: head/share/man/man9/bios.9
==
--- head/share/man/man9/bios.9  Mon Feb 22 08:22:08 2016(r295879)
+++ head/share/man/man9/bios.9  Mon Feb 22 09:02:20 2016(r295880)
@@ -38,7 +38,6 @@
 .In vm/vm.h
 .In vm/pmap.h
 .In machine/param.h
-.In machine/pmap.h
 .In machine/pc/bios.h
 .Ft uint32_t
 .Fn bios_sigsearch "uint32_t start" "u_char *sig" "int siglen" "int paralen" 
"int sigofs"

Modified: head/sys/amd64/cloudabi64/cloudabi64_sysvec.c
==
--- head/sys/amd64/cloudabi64/cloudabi64_sysvec.c   Mon Feb 22 08:22:08 
2016(r295879)
+++ head/sys/amd64/cloudabi64/cloudabi64_sysvec.c   Mon Feb 22 09:02:20 
2016(r295880)
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 
 #include 
 #include 
-#include 
 #include 
 
 #include 

Modified: head/sys/amd64/vmm/amd/npt.c
==
--- head/sys/amd64/vmm/amd/npt.cMon Feb 22 08:22:08 2016
(r295879)
+++ head/sys/amd64/vmm/amd/npt.cMon Feb 22 09:02:20 2016
(r295880)
@@ -36,8 +36,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
-#include 
-
 #include "npt.h"
 
 SYSCTL_DECL(_hw_vmm);

Modified: head/sys/amd64/vmm/amd/svm.c
==
--- head/sys/amd64/vmm/amd/svm.cMon Feb 22 08:22:08 2016
(r295879)
+++ head/sys/amd64/vmm/amd/svm.cMon Feb 22 09:02:20 2016
(r295880)
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

Modified: head/sys/arm/annapurna/alpine/alpine_machdep.c
==
--- head/sys/arm/annapurna/alpine/alpine_machdep.c  Mon Feb 22 08:22:08 
2016(r295879)
+++ head/sys/arm/annapurna/alpine/alpine_machdep.c  Mon Feb 22 09:02:20 
2016(r295880)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include 
 #include  /* For trapframe_t, used in  */
 #include 
-#include 
 #include 
 #include 
 #include 

Modified: head/sys/arm/arm/mp_machdep.c
==
--- head/sys/arm/arm/mp_machdep.c   Mon Feb 22 08:22:08 2016