Daemon News Ezine BSD News BSD Mall BSD Support Forum BSD Advocacy BSD Updates

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

PERFORCE change 90446 for review



http://perforce.freebsd.org/chv.cgi?CH=90446

Change 90446 by alc@alc_home on 2006/01/27 02:44:45

	IFC @90444

Affected files ...

.. //depot/projects/superpages/src/include/nl_types.h#2 integrate
.. //depot/projects/superpages/src/include/stdio.h#2 integrate
.. //depot/projects/superpages/src/sbin/dhclient/dhclient-script#3 integrate
.. //depot/projects/superpages/src/sys/compat/linux/linux_stats.c#3 integrate
.. //depot/projects/superpages/src/sys/dev/amr/amr.c#3 integrate
.. //depot/projects/superpages/src/sys/dev/an/if_an.c#3 integrate
.. //depot/projects/superpages/src/sys/dev/isp/isp_freebsd.h#3 integrate
.. //depot/projects/superpages/src/sys/dev/sound/pci/solo.c#3 integrate
.. //depot/projects/superpages/src/sys/kern/tty_pts.c#2 integrate
.. //depot/projects/superpages/src/sys/kern/tty_pty.c#4 integrate
.. //depot/projects/superpages/src/sys/sparc64/central/central.c#3 integrate
.. //depot/projects/superpages/src/sys/sparc64/ebus/ebus.c#3 integrate
.. //depot/projects/superpages/src/sys/sparc64/fhc/fhc_central.c#3 integrate
.. //depot/projects/superpages/src/sys/sparc64/fhc/fhc_nexus.c#3 integrate
.. //depot/projects/superpages/src/sys/sparc64/pci/psycho.c#3 integrate
.. //depot/projects/superpages/src/sys/sparc64/sbus/dma_sbus.c#3 integrate
.. //depot/projects/superpages/src/sys/sparc64/sbus/sbus.c#3 integrate
.. //depot/projects/superpages/src/sys/sys/cdefs.h#3 integrate
.. //depot/projects/superpages/www/en/donations/wantlist.sgml#7 integrate
.. //depot/projects/superpages/www/en/news/news.xml#6 integrate
.. //depot/projects/superpages/www/en/news/status/report-oct-2005-dec-2005.xml#2 integrate

Differences ...

==== //depot/projects/superpages/src/include/nl_types.h#2 (text+ko) ====

@@ -35,7 +35,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/include/nl_types.h,v 1.11 2005/02/27 16:20:53 phantom Exp $
+ * $FreeBSD: src/include/nl_types.h,v 1.12 2006/01/26 20:53:40 stefanf Exp $
  */
 
 #ifndef _NL_TYPES_H_
@@ -97,8 +97,7 @@
 
 __BEGIN_DECLS
 nl_catd  catopen(const char *, int);
-char    *catgets(nl_catd, int, int, const char *)
-	__attribute__((__format_arg__(4)));
+char    *catgets(nl_catd, int, int, const char *) __format_arg(4);
 int	 catclose(nl_catd);
 __END_DECLS
 

==== //depot/projects/superpages/src/include/stdio.h#2 (text+ko) ====

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
- * $FreeBSD: src/include/stdio.h,v 1.56 2004/06/20 10:01:30 tjr Exp $
+ * $FreeBSD: src/include/stdio.h,v 1.57 2006/01/26 20:53:40 stefanf Exp $
  */
 
 #ifndef	_STDIO_H_
@@ -328,12 +328,7 @@
 int	 asprintf(char **, const char *, ...) __printflike(2, 3);
 char	*ctermid_r(char *);
 char	*fgetln(FILE *, size_t *);
-#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3
-#define	__ATTR_FORMAT_ARG	__attribute__((__format_arg__(2)))
-#else
-#define	__ATTR_FORMAT_ARG
-#endif
-__const char *fmtcheck(const char *, const char *) __ATTR_FORMAT_ARG;
+__const char *fmtcheck(const char *, const char *) __format_arg(2);
 int	 fpurge(FILE *);
 void	 setbuffer(FILE *, char *, int);
 int	 setlinebuf(FILE *);

==== //depot/projects/superpages/src/sbin/dhclient/dhclient-script#3 (text+ko) ====

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $OpenBSD: dhclient-script,v 1.6 2004/05/06 18:22:41 claudio Exp $
-# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.13 2006/01/24 06:11:55 brooks Exp $
+# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.14 2006/01/26 21:05:39 brooks Exp $
 #
 # Copyright (c) 2003 Kenneth R Westerback <krw@xxxxxxxxxxx>
 #
@@ -135,7 +135,7 @@
 	# thus broke the script. This code creates the resolv.conf if either
 	# are provided.
 
-	local tmpres=${TMPDIR:-/tmp}/resolv.conf.std
+	local tmpres=/var/run/resolv.conf.${interface}
 	rm -f $tmpres
 
 	if [ -n "$new_domain_name" ]; then

==== //depot/projects/superpages/src/sys/compat/linux/linux_stats.c#3 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.73 2006/01/26 01:32:46 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.74 2006/01/26 21:48:50 cognet Exp $");
 
 #include "opt_mac.h"
 
@@ -137,7 +137,7 @@
 	      && path[9] >= '0' && path[9] <= '9') {
 		  /* 
    		   * Linux checks major and minors of the slave device to make
-		   * sure it's a pty deivce, so let's make him believe it is.
+		   * sure it's a pty device, so let's make him believe it is.
 		   */
 		  buf.st_rdev = (136 << 8);
 	  }

==== //depot/projects/superpages/src/sys/dev/amr/amr.c#3 (text+ko) ====

@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.73 2006/01/14 17:59:28 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.74 2006/01/26 22:39:12 ambrisko Exp $");
 
 /*
  * Driver for the AMI MegaRaid family of controllers.
@@ -2220,7 +2220,7 @@
 {
     int		worked, i;
     u_int32_t	outd;
-    u_int8_t	nstatus ,status;
+    u_int8_t	nstatus;
     u_int8_t	completed[46];
 
     debug_called(3);
@@ -2244,16 +2244,11 @@
 	    sc->amr_mailbox->mb_completed[i] = 0xff;
 	}
 
-	/* this should never happen, someone screwed up the completion status */
-	if ((status = sc->amr_mailbox->mb_status) == 0xff) {
-	    device_printf(sc->amr_dev, "status 0xff from the firmware\n");
-	    return (worked);
-	}
+	/* Save information for later processing */
+	mbsave->mb_nstatus = nstatus;
+	mbsave->mb_status = sc->amr_mailbox->mb_status;
 	sc->amr_mailbox->mb_status = 0xff;
 
-	/* Save information for later processing */
-	mbsave->mb_nstatus = nstatus;
-	mbsave->mb_status = status;
 	for (i = 0; i < nstatus; i++)
 	    mbsave->mb_completed[i] = completed[i];
 

==== //depot/projects/superpages/src/sys/dev/an/if_an.c#3 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.76 2006/01/15 12:09:03 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.77 2006/01/26 19:55:29 njl Exp $");
 
 /*
  * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form.
@@ -88,6 +88,7 @@
 #endif
 
 #include <sys/param.h>
+#include <sys/ctype.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
@@ -1593,9 +1594,7 @@
 			printf("%02x ", *ptr2);
 
 			temp = *ptr2++;
-			if (temp >= ' ' && temp <= '~')
-				buf[count] = temp;
-			else if (temp >= 'A' && temp <= 'Z')
+			if (isprint(temp))
 				buf[count] = temp;
 			else
 				buf[count] = '.';

==== //depot/projects/superpages/src/sys/dev/isp/isp_freebsd.h#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.81 2006/01/23 06:23:37 mjacob Exp $ */
+/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.82 2006/01/27 00:46:10 mjacob Exp $ */
 /*-
  * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions
  *
@@ -74,6 +74,13 @@
 #define	ISP_SBUS_SUPPORTED	0
 #endif
 
+/*
+ * Hackery- remove TARGET MODE when compiling as a module on sparc64
+ */
+#if	defined(__sparc64__) && defined(KLD_MODULE) && defined(ISP_TARGET_MODE)
+#undef	ISP_TARGET_MODE
+#endif
+
 #define	HANDLE_LOOPSTATE_IN_OUTER_LAYERS	1
 /* #define	ISP_SMPLOCK			1 */
 

==== //depot/projects/superpages/src/sys/dev/sound/pci/solo.c#3 (text+ko) ====

@@ -33,13 +33,13 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/solo.c,v 1.37 2006/01/06 05:04:18 ariff Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/solo.c,v 1.38 2006/01/27 02:01:27 ariff Exp $");
 
 #define SOLO_DEFAULT_BUFSZ 16384
 #define ABS(x) (((x) < 0)? -(x) : (x))
 
 /* if defined, playback always uses the 2nd channel and full duplex works */
-#undef ESS18XX_DUPLEX
+#define ESS18XX_DUPLEX	1
 
 /* more accurate clocks and split audio1/audio2 rates */
 #define ESS18XX_NEWSPEED

==== //depot/projects/superpages/src/sys/kern/tty_pts.c#2 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/tty_pts.c,v 1.1 2006/01/26 01:30:33 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/tty_pts.c,v 1.3 2006/01/27 00:21:48 cognet Exp $");
 
 /*
  * Pseudo-teletype Driver
@@ -119,6 +119,7 @@
 #define TSA_PTC_WRITE(tp)	((void *)&(tp)->t_rawq.c_cl)
 #define TSA_PTS_READ(tp)	((void *)&(tp)->t_canq)
 
+#define NUM_TO_MINOR(c)		((c & 0xff) | ((c & ~0xff) << 16))
 /*-
  * Once a tty is allocated, it cannot (currently) be freed.  As such,
  * we keep a global list of ptys that have been used so we can recycle
@@ -188,7 +189,7 @@
 	int nb;
 
 	mtx_lock(&pt_mtx);
-	if (nb_allocated >= max_pts) {
+	if (nb_allocated >= max_pts || nb_allocated == 0xffffff) {
 		mtx_unlock(&pt_mtx);
 		return (NULL);
 	}
@@ -444,8 +445,13 @@
 	 * XXX: Might want to make the ownership/permissions here more
 	 * configurable.
 	 */
-	pt->pt_devs = devs = make_dev_cred(&pts_cdevsw, pt->pt_num, 
-	    td->td_ucred, UID_ROOT, GID_WHEEL, 0666, "pts/%d", pt->pt_num);
+	if (pt->pt_devs)
+		devs = pt->pt_devs;
+	else
+		pt->pt_devs = devs = make_dev_cred(&pts_cdevsw, 
+		    NUM_TO_MINOR(pt->pt_num), 
+		    td->td_ucred, UID_ROOT, GID_WHEEL, 0666, "pts/%d",
+		    pt->pt_num);
 	devs->si_drv1 = pt;
 	devs->si_tty = pt->pt_tty;
 	pt->pt_tty->t_dev = devs;
@@ -942,8 +948,9 @@
 	 * opened, or some way to tell devfs that "this had better be for
 	 * an open() or we won't create a device".
 	 */
-	pt->pt_devc = devc = make_dev_cred(&ptc_cdevsw, pt->pt_num, cred,
-	    UID_ROOT, GID_WHEEL, 0666, "pty%d", pt->pt_num);
+	pt->pt_devc = devc = make_dev_cred(&ptc_cdevsw, 
+	    NUM_TO_MINOR(pt->pt_num), cred, UID_ROOT, GID_WHEEL, 0666, "pty%d",
+	    pt->pt_num);
 
 	dev_ref(devc);
 	devc->si_drv1 = pt;

==== //depot/projects/superpages/src/sys/kern/tty_pty.c#4 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/tty_pty.c,v 1.142 2006/01/26 01:30:33 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/tty_pty.c,v 1.143 2006/01/26 20:54:49 cognet Exp $");
 
 /*
  * Pseudo-teletype Driver
@@ -327,7 +327,8 @@
 	pt->pt_send = 0;
 	pt->pt_ucntl = 0;
 
-	pty_create_slave(td->td_ucred, pt, minor(dev));
+	if (!pt->devs)
+		pty_create_slave(td->td_ucred, pt, minor(dev));
 	pt->pt_devc_open = 1;
 
 	return (0);

==== //depot/projects/superpages/src/sys/sparc64/central/central.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/sparc64/central/central.c,v 1.10 2005/12/03 18:14:47 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/sparc64/central/central.c,v 1.11 2006/01/26 21:14:31 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -71,6 +71,9 @@
 	/* Device interface. */
 	DEVMETHOD(device_probe,		central_probe),
 	DEVMETHOD(device_attach,	central_attach),
+	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
+	DEVMETHOD(device_suspend,	bus_generic_suspend),
+	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface. */
 	DEVMETHOD(bus_print_child,	central_print_child),

==== //depot/projects/superpages/src/sys/sparc64/ebus/ebus.c#3 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/sparc64/ebus/ebus.c,v 1.24 2005/11/22 16:39:43 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/sparc64/ebus/ebus.c,v 1.25 2006/01/26 21:14:31 marius Exp $");
 
 /*
  * UltraSPARC 5 and beyond Ebus support.
@@ -116,6 +116,9 @@
 	/* Device interface */
 	DEVMETHOD(device_probe,		ebus_probe),
 	DEVMETHOD(device_attach,	ebus_attach),
+	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
+	DEVMETHOD(device_suspend,	bus_generic_suspend),
+	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
 	DEVMETHOD(bus_print_child,	ebus_print_child),
@@ -426,7 +429,7 @@
 			device_printf(dev,
 			    "<%s>: could not map EBus interrupt %d\n",
 			    edi->edi_obdinfo.obd_name, intrs[i]);
-			free(reg, M_OFWPROP);
+			free(intrs, M_OFWPROP);
 			goto fail;
 		}
 		resource_list_add(&edi->edi_rl, SYS_RES_IRQ, i,

==== //depot/projects/superpages/src/sys/sparc64/fhc/fhc_central.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>                                                         
-__FBSDID("$FreeBSD: src/sys/sparc64/fhc/fhc_central.c,v 1.9 2005/11/22 16:39:44 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/sparc64/fhc/fhc_central.c,v 1.10 2006/01/26 21:14:31 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,6 +52,9 @@
 	/* Device interface. */
 	DEVMETHOD(device_probe,		fhc_central_probe),
 	DEVMETHOD(device_attach,	fhc_central_attach),
+	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
+	DEVMETHOD(device_suspend,	bus_generic_suspend),
+	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface. */
 	DEVMETHOD(bus_print_child,	fhc_print_child),

==== //depot/projects/superpages/src/sys/sparc64/fhc/fhc_nexus.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>                                                         
-__FBSDID("$FreeBSD: src/sys/sparc64/fhc/fhc_nexus.c,v 1.8 2005/11/22 16:39:44 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/sparc64/fhc/fhc_nexus.c,v 1.9 2006/01/26 21:14:31 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -55,6 +55,9 @@
 	/* Device interface. */
 	DEVMETHOD(device_probe,		fhc_nexus_probe),
 	DEVMETHOD(device_attach,	fhc_nexus_attach),
+	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
+	DEVMETHOD(device_suspend,	bus_generic_suspend),
+	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface. */
 	DEVMETHOD(bus_print_child,	fhc_print_child),

==== //depot/projects/superpages/src/sys/sparc64/pci/psycho.c#3 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/sparc64/pci/psycho.c,v 1.58 2005/12/03 19:52:20 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/sparc64/pci/psycho.c,v 1.59 2006/01/26 21:14:31 marius Exp $");
 
 /*
  * Support for `Hummingbird' (UltraSPARC IIe), `Psycho' and `Psycho+'
@@ -124,6 +124,9 @@
 	/* Device interface */
 	DEVMETHOD(device_probe,		psycho_probe),
 	DEVMETHOD(device_attach,	psycho_attach),
+	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
+	DEVMETHOD(device_suspend,	bus_generic_suspend),
+	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
 	DEVMETHOD(bus_print_child,	bus_generic_print_child),

==== //depot/projects/superpages/src/sys/sparc64/sbus/dma_sbus.c#3 (text+ko) ====

@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/sparc64/sbus/dma_sbus.c,v 1.2 2005/11/22 16:39:44 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/sparc64/sbus/dma_sbus.c,v 1.3 2006/01/26 21:14:32 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -105,9 +105,7 @@
 static bus_print_child_t dma_print_child;
 static bus_probe_nomatch_t dma_probe_nomatch;
 static bus_get_resource_list_t dma_get_resource_list;
-#if 0
 static bus_setup_intr_t dma_setup_intr;
-#endif
 static ofw_bus_get_devinfo_t dma_get_devinfo;
 
 static struct dma_devinfo *dma_setup_dinfo(device_t, struct dma_softc *,
@@ -119,15 +117,14 @@
         /* Device interface */
 	DEVMETHOD(device_probe,		dma_probe),
 	DEVMETHOD(device_attach,	dma_attach),
+	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
+	DEVMETHOD(device_suspend,	bus_generic_suspend),
+	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
 	DEVMETHOD(bus_print_child,	dma_print_child),
 	DEVMETHOD(bus_probe_nomatch,	dma_probe_nomatch),
-#if 0
 	DEVMETHOD(bus_setup_intr,	dma_setup_intr),
-#else
-	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
-#endif
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
 	DEVMETHOD(bus_alloc_resource,	bus_generic_rl_alloc_resource),
 	DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource),
@@ -404,7 +401,6 @@
 	return (&ddi->ddi_rl);
 }
 
-#if 0
 static int
 dma_setup_intr(device_t dev, device_t child, struct resource *ires, int flags,
     driver_intr_t *intr, void *arg, void **cookiep)
@@ -423,7 +419,6 @@
 	return (BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags,
 	    intr, arg, cookiep));
 }
-#endif
 
 static const struct ofw_bus_devinfo *
 dma_get_devinfo(device_t bus, device_t child)

==== //depot/projects/superpages/src/sys/sparc64/sbus/sbus.c#3 (text+ko) ====

@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/sparc64/sbus/sbus.c,v 1.36 2005/11/22 16:39:44 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/sparc64/sbus/sbus.c,v 1.37 2006/01/26 21:14:32 marius Exp $");
 
 /*
  * SBus support.
@@ -219,6 +219,9 @@
 	/* Device interface */
 	DEVMETHOD(device_probe,		sbus_probe),
 	DEVMETHOD(device_attach,	sbus_attach),
+	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
+	DEVMETHOD(device_suspend,	bus_generic_suspend),
+	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
 	DEVMETHOD(bus_print_child,	sbus_print_child),

==== //depot/projects/superpages/src/sys/sys/cdefs.h#3 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cdefs.h	8.8 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/sys/cdefs.h,v 1.90 2005/10/05 17:21:09 netchild Exp $
+ * $FreeBSD: src/sys/sys/cdefs.h,v 1.91 2006/01/26 20:53:40 stefanf Exp $
  */
 
 #ifndef	_SYS_CDEFS_H_
@@ -324,11 +324,13 @@
 #if !__GNUC_PREREQ__(2, 7) && !defined(__INTEL_COMPILER)
 #define	__printflike(fmtarg, firstvararg)
 #define	__scanflike(fmtarg, firstvararg)
+#define	__format_arg(fmtarg)
 #else
 #define	__printflike(fmtarg, firstvararg) \
 	    __attribute__((__format__ (__printf__, fmtarg, firstvararg)))
 #define	__scanflike(fmtarg, firstvararg) \
 	    __attribute__((__format__ (__scanf__, fmtarg, firstvararg)))
+#define	__format_arg(fmtarg)	__attribute__((__format_arg__ (fmtarg)))
 #endif
 
 /* Compiler-dependent macros that rely on FreeBSD-specific extensions. */
@@ -379,7 +381,7 @@
  * Embed the rcs id of a source file in the resulting library.  Note that in
  * more recent ELF binutils, we use .ident allowing the ID to be stripped.
  * Usage:
- *	__FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.90 2005/10/05 17:21:09 netchild Exp $");
+ *	__FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.91 2006/01/26 20:53:40 stefanf Exp $");
  */
 #ifndef	__FBSDID
 #if !defined(lint) && !defined(STRIP_FBSDID)

==== //depot/projects/superpages/www/en/donations/wantlist.sgml#7 (text+ko) ====

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/donations/wantlist.sgml,v 1.388 2006/01/25 19:48:41 cperciva Exp $">
+<!ENTITY date "$FreeBSD: www/en/donations/wantlist.sgml,v 1.389 2006/01/26 20:34:07 glebius Exp $">
 <!ENTITY title "FreeBSD Developers Want List">
 <!ENTITY email 'donations'>
 <!ENTITY % navincludes SYSTEM "../includes.navabout.sgml"> %navincludes;
@@ -124,6 +124,32 @@
       </tr>
 
       <tr>
+	<td>glebius</td>
+	<td>Russia, Moscow</td>
+	<td>Broadcom BCM5700 PCI-X NIC, preferrably with
+	  external SSRAM</td>
+	<td>Test and profile my changes to network stack.
+	  Improve bge(4) driver.</td>
+      </tr>
+
+      <tr>
+	<td>glebius</td>
+	<td>Russia, Moscow</td>
+	<td>Intel 82546 PCI-X NIC</td>
+	<td>Test and profile my changes to network stack.
+	  Improve em(4) driver.</td>
+      </tr>
+
+      <tr>
+	<td>glebius</td>
+	<td>Russia, Moscow</td>
+	<td>Manageable switch with at least two Gigabit ports,
+	  and few Fast Ethernet ports, capable to do 802.1q,
+	  LACP, GVRP, etc. </td>
+	<td>Test and profile my changes to network stack.</td>
+      </tr>
+
+      <tr>
 	<td>grehan</td>
 	<td>California, USA</td>
 	<td>Apple G4 XServe</td>

==== //depot/projects/superpages/www/en/news/news.xml#6 (text+ko) ====

@@ -21,7 +21,7 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/en/news/news.xml,v 1.363 2006/01/20 17:43:49 pav Exp $
+      $FreeBSD: www/en/news/news.xml,v 1.364 2006/01/26 21:06:06 mlaier Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -32,6 +32,16 @@
       <name>1</name>
 
       <day>
+        <name>26</name>
+        <event>
+	  <title>October-December 2005 Status Report</title>
+
+	  <p>The October-December, 2005 status report is <a
+	    href="$base/news/status/report-oct-2005-dec-2005.html">now
+	    available</a> with 26 entries.</p>
+        </event>
+      </day>
+      <day>
         <name>19</name>
         <event>
           <p>New committer: <a

==== //depot/projects/superpages/www/en/news/status/report-oct-2005-dec-2005.xml#2 (text+ko) ====

@@ -8,7 +8,7 @@
   <section>
     <title>Introduction</title>
 
-    <p>This report is about the rather quite last quarter of 2005, with
+    <p>This report is about the rather quiet last quarter of 2005, with
     the release of FreeBSD 6.0 and the holiday season things evolved in
     the background. Nontheless, most exciting projects hit the tree (or
     are going to very soon).</p>
@@ -374,7 +374,7 @@
       disk accesses and/or driver bugs to new and improved features
       (software volume control implemented for soundcards which do not
       have hardware volume control). Additionally a new driver
-      (snd_atiixp) has seen the light and a lot of problem reports where
+      (snd_atiixp) has seen the light and a lot of problem reports were
       fixed.</p>
 
       <p>Most of those changes and the changes mentioned in the previous
@@ -967,7 +967,7 @@
           <common>Ambrisko</common>
         </name>
 
-        <email>douga@xxxxxxxxxxx</email>
+        <email>ambrisko@xxxxxxxxxxx</email>
       </person>
     </contact>
 
@@ -1201,7 +1201,7 @@
 
     <links>
       <url href="http://people.freebsd.org/~andre/tcpoptimization.html">
-      TCP/IP Optimization Fundraise 2005</url>
+      TCP/IP Optimization Fundraiser 2005</url>
 
       <url
       href="http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/dev/em/if_em.c?rev=1.98&amp;content-type=text/x-cvsweb-markup">
@@ -1213,7 +1213,7 @@
     </links>
 
     <body>
-      <p>The fundraise has been very successful and I want to thank
+      <p>The fundraiser has been very successful and I want to thank
       everyone who has pledged their support and tipped the jar. The full
       amount plus a little bit more has been raised in a very short
       timeframe. More information on the exact amounts and their sponsors