[illumos-gate merge]

commit 9890ff8357a674572254e0be06b175a1e8eab4b0
    10028 loader: implement framebuffer console
    10029 common/font: create shared font.c
    10030 import pnglite into usr/src/common/pnglite
    8918 loader.efi: add vesa edid support
    10031 loader: import tem for loader console
    10032 loader: implement tem utf-8 support
    10033 ficl: add simple gfx words
    10034 loader: use term-drawrect for menu frame
    10035 loader: add alpha blending for gfx_fb
    10036 ficl: add fb-putimage
    10037 loader: add illumos.png logo
    10038 loader: replace gop and vesa with framebuffer
    10039 loader: build rules for new font setup
    10040 loader: gfx use GOP Blt() function in visual_io callbacks
commit f33b666290305a2b2c134d23cbd1e70e06bf36fd
    7796 uts: ldterm default to utf-8
commit adc2b73db62a4506a57dfd1ce89bcadc4a60a29d
    7784 uts: console input should support Unicode
commit 1f5207b7604fb44407eb4342aff613f7c4508508
    10063 basic support for smatch
    10153 checkpaths shouldn't check packaging exceptions
commit c0455f334914631f42eb41177d677e2820ee6506
    9478 etdump: Add the etdump utility for dumping El Torito boot catalog information.
commit c62757b2b8b6c26589d7704d0ff20beb107fcd9a
    10154 zfs: cast between incompatible function types
commit 781f142d2ae880bb893875d2a114552171a5c3e5
    10064 loader: zfs reader should not probe partitionless disks
commit 8a06b3d6467c15646e663c05086378f16288af85
    10155 ip: cast between incompatible function types
commit c5749750a3e052f1194f65a303456224c51dea63
    10157 sgs/libld: cast between incompatible function types
commit 5e90af26eb6ed2206c2a5f5131a1f3c377d6e8c4
    10158 sgs/rtld: cast between incompatible function types
commit adc04c2d55dd20cc6a0622f1147c0b084cdc3099
    10159 libc: cast between incompatible function types
commit 9419bc2fc61b54b25a4e45211d31fcb920ff67cc
    10162 Sun/Solaris/Kstat: cast between incompatible function types

	Conflicts:
	usr/src/tools/env/illumos.sh

1 files changed, 15 insertions, 14 deletions

diff --git a/usr/src/uts/common/inet/tcp/tcp.c b/usr/src/uts/common/inet/tcp/tcp.c
index d86680c4b5..79c9478558 100644
--- a/usr/src/uts/common/inet/tcp/tcp.c
+++ b/usr/src/uts/common/inet/tcp/tcp.c
@@ -286,7 +286,7 @@ static void	tcp_iss_init(tcp_t *tcp);
 static void	tcp_reinit(tcp_t *tcp);
 static void	tcp_reinit_values(tcp_t *tcp);
 
-static void	tcp_wsrv(queue_t *q);
+static int	tcp_wsrv(queue_t *q);
 static void	tcp_update_lso(tcp_t *tcp, ip_xmit_attr_t *ixa);
 static void	tcp_update_zcopy(tcp_t *tcp);
 static void	tcp_notify(void *, ip_xmit_attr_t *, ixa_notify_type_t,
@@ -316,25 +316,25 @@ static struct module_info tcp_winfo =  {
  * We have separate open functions for the /dev/tcp and /dev/tcp6 devices.
  */
 struct qinit tcp_rinitv4 = {
-	NULL, (pfi_t)tcp_rsrv, tcp_openv4, tcp_tpi_close, NULL, &tcp_rinfo
+	NULL, tcp_rsrv, tcp_openv4, tcp_tpi_close, NULL, &tcp_rinfo
 };
 
 struct qinit tcp_rinitv6 = {
-	NULL, (pfi_t)tcp_rsrv, tcp_openv6, tcp_tpi_close, NULL, &tcp_rinfo
+	NULL, tcp_rsrv, tcp_openv6, tcp_tpi_close, NULL, &tcp_rinfo
 };
 
 struct qinit tcp_winit = {
-	(pfi_t)tcp_wput, (pfi_t)tcp_wsrv, NULL, NULL, NULL, &tcp_winfo
+	tcp_wput, tcp_wsrv, NULL, NULL, NULL, &tcp_winfo
 };
 
 /* Initial entry point for TCP in socket mode. */
 struct qinit tcp_sock_winit = {
-	(pfi_t)tcp_wput_sock, (pfi_t)tcp_wsrv, NULL, NULL, NULL, &tcp_winfo
+	tcp_wput_sock, tcp_wsrv, NULL, NULL, NULL, &tcp_winfo
 };
 
 /* TCP entry point during fallback */
 struct qinit tcp_fallback_sock_winit = {
-	(pfi_t)tcp_wput_fallback, NULL, NULL, NULL, NULL, &tcp_winfo
+	tcp_wput_fallback, NULL, NULL, NULL, NULL, &tcp_winfo
 };
 
 /*
@@ -343,11 +343,11 @@ struct qinit tcp_fallback_sock_winit = {
  * been created.
  */
 struct qinit tcp_acceptor_rinit = {
-	NULL, (pfi_t)tcp_rsrv, NULL, tcp_tpi_close_accept, NULL, &tcp_winfo
+	NULL, tcp_rsrv, NULL, tcp_tpi_close_accept, NULL, &tcp_winfo
 };
 
 struct qinit tcp_acceptor_winit = {
-	(pfi_t)tcp_tpi_accept, NULL, NULL, NULL, NULL, &tcp_winfo
+	tcp_tpi_accept, NULL, NULL, NULL, NULL, &tcp_winfo
 };
 
 /* For AF_INET aka /dev/tcp */
@@ -1036,7 +1036,7 @@ void
 tcp_close_common(conn_t *connp, int flags)
 {
 	tcp_t		*tcp = connp->conn_tcp;
-	mblk_t 		*mp = &tcp->tcp_closemp;
+	mblk_t		*mp = &tcp->tcp_closemp;
 	boolean_t	conn_ioctl_cleanup_reqd = B_FALSE;
 	mblk_t		*bp;
 
@@ -1488,7 +1488,7 @@ tcp_get_conn(void *arg, tcp_stack_t *tcps)
 	tcp_t			*tcp = NULL;
 	conn_t			*connp = NULL;
 	squeue_t		*sqp = (squeue_t *)arg;
-	tcp_squeue_priv_t 	*tcp_time_wait;
+	tcp_squeue_priv_t	*tcp_time_wait;
 	netstack_t		*ns;
 	mblk_t			*tcp_rsrv_mp = NULL;
 
@@ -1568,8 +1568,8 @@ static int
 tcp_connect_ipv4(tcp_t *tcp, ipaddr_t *dstaddrp, in_port_t dstport,
     uint_t srcid)
 {
-	ipaddr_t 	dstaddr = *dstaddrp;
-	uint16_t 	lport;
+	ipaddr_t	dstaddr = *dstaddrp;
+	uint16_t	lport;
 	conn_t		*connp = tcp->tcp_connp;
 	tcp_stack_t	*tcps = tcp->tcp_tcps;
 	int		error;
@@ -1657,7 +1657,7 @@ static int
 tcp_connect_ipv6(tcp_t *tcp, in6_addr_t *dstaddrp, in_port_t dstport,
     uint32_t flowinfo, uint_t srcid, uint32_t scope_id)
 {
-	uint16_t 	lport;
+	uint16_t	lport;
 	conn_t		*connp = tcp->tcp_connp;
 	tcp_stack_t	*tcps = tcp->tcp_tcps;
 	int		error;
@@ -3431,12 +3431,13 @@ tcp_notify(void *arg, ip_xmit_attr_t *ixa, ixa_notify_type_t ntype,
  * The TCP write service routine should never be called...
  */
 /* ARGSUSED */
-static void
+static int
 tcp_wsrv(queue_t *q)
 {
 	tcp_stack_t	*tcps = Q_TO_TCP(q)->tcp_tcps;
 
 	TCP_STAT(tcps, tcp_wsrv_called);
+	return (0);
 }
 
 /*