PERFORCE change 50788 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat Apr 10 13:11:20 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=50788
Change 50788 by marcel at marcel_nfs on 2004/04/10 13:10:53
IFC @50787
Affected files ...
.. //depot/projects/gdb/lib/libc/locale/gb2312.c#4 integrate
.. //depot/projects/gdb/sbin/dump/dumprmt.c#3 integrate
.. //depot/projects/gdb/sys/conf/files#14 integrate
.. //depot/projects/gdb/sys/conf/files.i386#10 integrate
.. //depot/projects/gdb/sys/dev/trm/trm.c#5 integrate
.. //depot/projects/gdb/sys/kern/kern_resource.c#4 integrate
.. //depot/projects/gdb/sys/modules/twa/Makefile#3 integrate
.. //depot/projects/gdb/sys/modules/wlan/Makefile#2 integrate
Differences ...
==== //depot/projects/gdb/lib/libc/locale/gb2312.c#4 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/gb2312.c,v 1.5 2004/04/10 00:27:52 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/gb2312.c,v 1.6 2004/04/10 14:36:57 davidxu Exp $");
#include <runetype.h>
#include <stdlib.h>
@@ -100,7 +100,7 @@
int i, len, ocount;
size_t ncopy;
- gs = (_GB2312State *)gs;
+ gs = (_GB2312State *)ps;
if (s == NULL) {
s = "";
==== //depot/projects/gdb/sbin/dump/dumprmt.c#3 (text+ko) ====
@@ -10,7 +10,7 @@
* 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.
-* 4. Neither the name of the University nor the names of its contributors
+ * 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -32,7 +32,7 @@
static char sccsid[] = "@(#)dumprmt.c 8.3 (Berkeley) 4/28/95";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/dump/dumprmt.c,v 1.21 2004/04/09 19:58:27 markm Exp $";
+ "$FreeBSD: src/sbin/dump/dumprmt.c,v 1.22 2004/04/10 02:22:35 bde Exp $";
#endif /* not lint */
#include <sys/param.h>
==== //depot/projects/gdb/sys/conf/files#14 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.883 2004/04/09 15:47:10 markm Exp $
+# $FreeBSD: src/sys/conf/files,v 1.884 2004/04/10 19:43:15 marcel Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -606,7 +606,6 @@
dev/random/harvest.c standard
dev/random/randomdev.c optional random
dev/random/randomdev_soft.c optional random
-dev/random/nehemiah.c optional random
dev/random/probe.c optional random
dev/random/yarrow.c optional random
dev/random/hash.c optional random
==== //depot/projects/gdb/sys/conf/files.i386#10 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.i386,v 1.483 2004/04/01 10:02:50 des Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.484 2004/04/10 19:43:15 marcel Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -152,6 +152,7 @@
dev/lnc/if_lnc_isa.c optional lnc isa
dev/ppc/ppc.c optional ppc
dev/ppc/ppc_puc.c optional ppc puc pci
+dev/random/nehemiah.c optional random
dev/sbni/if_sbni.c optional sbni
dev/sbni/if_sbni_isa.c optional sbni isa
dev/sbni/if_sbni_pci.c optional sbni pci
==== //depot/projects/gdb/sys/dev/trm/trm.c#5 (text+ko) ====
@@ -12,7 +12,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/trm/trm.c,v 1.21 2004/03/17 17:50:45 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/trm/trm.c,v 1.22 2004/04/10 15:38:49 cognet Exp $");
/*
* HISTORY:
@@ -1087,7 +1087,7 @@
static void
trm_poll(struct cam_sim *psim)
{
-
+ trm_Interrupt(cam_sim_softc(psim));
}
static void
==== //depot/projects/gdb/sys/kern/kern_resource.c#4 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.135 2004/04/05 21:03:35 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.136 2004/04/10 11:08:16 mux Exp $");
#include "opt_compat.h"
@@ -1045,9 +1045,8 @@
LIST_REMOVE(uip, ui_hash);
mtx_unlock(&uihashtbl_mtx);
if (uip->ui_sbsize != 0)
- /* XXX no %qd in kernel. Truncate. */
- printf("freeing uidinfo: uid = %d, sbsize = %ld\n",
- uip->ui_uid, (long)uip->ui_sbsize);
+ printf("freeing uidinfo: uid = %d, sbsize = %jd\n",
+ uip->ui_uid, (intmax_t)uip->ui_sbsize);
if (uip->ui_proccnt != 0)
printf("freeing uidinfo: uid = %d, proccnt = %ld\n",
uip->ui_uid, uip->ui_proccnt);
==== //depot/projects/gdb/sys/modules/twa/Makefile#3 (text+ko) ====
@@ -1,11 +1,12 @@
-# $FreeBSD: src/sys/modules/twa/Makefile,v 1.2 2004/04/10 02:00:47 scottl Exp $
+# $FreeBSD: src/sys/modules/twa/Makefile,v 1.3 2004/04/10 02:41:22 vkashyap Exp $
#
-# Uncomment the following line to bundle firmware with the driver,
-# which may be flashed onto the controller, if the firmware on the
-# controller is older than the one bundled, and needs to be upgraded.
-# The size of the driver will increase significantly (to over 500KB)
-# if this option is selected.
+# In the line following this comment, a value of 0 on the right hand
+# side will not cause firmware to be bundled. Change this value to 1
+# to bundle the firmware with the driver, which may be flashed onto
+# the controller, if the firmware on the controller is older than the
+# one bundled, and needs to be upgraded. The size of the driver will
+# increase significantly (to over 500kB) if this option is selected.
#
TWA_FLASH_FIRMWARE?=0
==== //depot/projects/gdb/sys/modules/wlan/Makefile#2 (text+ko) ====
@@ -1,13 +1,16 @@
-# $FreeBSD: src/sys/modules/wlan/Makefile,v 1.2 2003/06/28 06:19:01 sam Exp $
+# $FreeBSD: src/sys/modules/wlan/Makefile,v 1.3 2004/04/10 19:41:15 kan Exp $
.PATH: ${.CURDIR}/../../net80211
KMOD= wlan
SRCS= ieee80211.c ieee80211_crypto.c ieee80211_input.c ieee80211_ioctl.c \
ieee80211_node.c ieee80211_output.c ieee80211_proto.c
-SRCS+= bus_if.h device_if.h opt_inet.h
+SRCS+= bus_if.h device_if.h opt_inet.h opt_ipx.h
opt_inet.h:
echo "#define INET 1" > opt_inet.h
+opt_ipx.h:
+ echo "#define IPX 1" > opt_ipx.h
+
.include <bsd.kmod.mk>
More information about the p4-projects
mailing list