PERFORCE change 75655 for review
Sam Leffler
sam at FreeBSD.org
Wed Apr 20 20:12:47 PDT 2005
http://perforce.freebsd.org/chv.cgi?CH=75655
Change 75655 by sam at sam_ebb on 2005/04/21 03:11:59
IFC @ 75654
Affected files ...
.. //depot/projects/wifi/lib/Makefile#7 integrate
.. //depot/projects/wifi/lib/libpmc/libpmc.c#2 integrate
.. //depot/projects/wifi/share/man/man9/Makefile#11 integrate
.. //depot/projects/wifi/share/man/man9/alloc_unr.9#1 branch
.. //depot/projects/wifi/sys/alpha/include/pmc_mdep.h#1 branch
.. //depot/projects/wifi/sys/amd64/amd64/trap.c#3 integrate
.. //depot/projects/wifi/sys/amd64/conf/NOTES#9 integrate
.. //depot/projects/wifi/sys/amd64/include/pmc_mdep.h#2 integrate
.. //depot/projects/wifi/sys/arm/include/pmc_mdep.h#1 branch
.. //depot/projects/wifi/sys/conf/NOTES#20 integrate
.. //depot/projects/wifi/sys/ddb/ddb.h#3 integrate
.. //depot/projects/wifi/sys/hwpmc/hwpmc_amd.c#2 integrate
.. //depot/projects/wifi/sys/hwpmc/hwpmc_intel.c#2 integrate
.. //depot/projects/wifi/sys/hwpmc/hwpmc_mod.c#2 integrate
.. //depot/projects/wifi/sys/hwpmc/hwpmc_pentium.c#2 integrate
.. //depot/projects/wifi/sys/hwpmc/hwpmc_piv.c#2 integrate
.. //depot/projects/wifi/sys/hwpmc/hwpmc_ppro.c#2 integrate
.. //depot/projects/wifi/sys/i386/conf/NOTES#14 integrate
.. //depot/projects/wifi/sys/i386/i386/trap.c#4 integrate
.. //depot/projects/wifi/sys/i386/include/pmc_mdep.h#2 integrate
.. //depot/projects/wifi/sys/ia64/include/pmc_mdep.h#1 branch
.. //depot/projects/wifi/sys/kern/kern_pmc.c#2 integrate
.. //depot/projects/wifi/sys/modules/Makefile#21 integrate
.. //depot/projects/wifi/sys/pc98/conf/NOTES#9 integrate
.. //depot/projects/wifi/sys/pc98/include/_bus.h#2 integrate
.. //depot/projects/wifi/sys/powerpc/include/pmc_mdep.h#1 branch
.. //depot/projects/wifi/sys/powerpc/powerpc/trap.c#6 integrate
.. //depot/projects/wifi/sys/sparc64/include/pmc_mdep.h#1 branch
.. //depot/projects/wifi/sys/sys/kdb.h#3 integrate
.. //depot/projects/wifi/sys/sys/pmc.h#2 integrate
.. //depot/projects/wifi/usr.sbin/Makefile#10 integrate
Differences ...
==== //depot/projects/wifi/lib/Makefile#7 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.204 2005/04/19 04:01:21 jkoshy Exp $
+# $FreeBSD: src/lib/Makefile,v 1.205 2005/04/20 20:50:32 marcel Exp $
# To satisfy shared library or ELF linkage when only the libraries being
# built are visible:
@@ -31,7 +31,7 @@
${_libio} libipsec \
libipx libkiconv libmagic libmenu ${_libmilter} ${_libmp} \
${_libncp} ${_libngatm} libopie libpam libpanel libpcap \
- ${_libpmc} ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \
+ libpmc ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \
${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \
libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind}
@@ -59,7 +59,6 @@
.if ${MACHINE_ARCH} == "i386"
_libncp= libncp
-_libpmc= libpmc
_libsmb= libsmb
_libvgl= libvgl
.endif
@@ -90,7 +89,6 @@
.if ${MACHINE_ARCH} == "amd64"
_libncp= libncp
-_libpmc= libpmc
_libsmb= libsmb
.endif
==== //depot/projects/wifi/lib/libpmc/libpmc.c#2 (text+ko) ====
@@ -22,20 +22,16 @@
* 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.
- *
- * $FreeBSD: src/lib/libpmc/libpmc.c,v 1.1 2005/04/19 04:01:21 jkoshy Exp $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.1 2005/04/19 04:01:21 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.3 2005/04/20 20:48:24 marcel Exp $");
#include <sys/types.h>
#include <sys/module.h>
#include <sys/pmc.h>
#include <sys/syscall.h>
-#include <machine/pmc_mdep.h>
-
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
@@ -47,7 +43,7 @@
#include <unistd.h>
/* Function prototypes */
-#if __i386__
+#if defined(__i386__)
static int k7_allocate_pmc(enum pmc_event _pe, char *_ctrspec,
struct pmc_op_pmcallocate *_pmc_config);
static int p6_allocate_pmc(enum pmc_event _pe, char *_ctrspec,
@@ -56,7 +52,7 @@
struct pmc_op_pmcallocate *_pmc_config);
static int p5_allocate_pmc(enum pmc_event _pe, char *_ctrspec,
struct pmc_op_pmcallocate *_pmc_config);
-#elif __amd64__
+#elif defined(__amd64__)
static int k8_allocate_pmc(enum pmc_event _pe, char *_ctrspec,
struct pmc_op_pmcallocate *_pmc_config);
#endif
@@ -154,6 +150,7 @@
#define PMCMASK(N,V) { .pm_name = #N, .pm_value = (V) }
#define NULLMASK PMCMASK(NULL,0)
+#if defined(__i386__) || defined(__amd64__)
static int
pmc_parse_mask(const struct pmc_masks *pmask, char *p, uint32_t *evmask)
{
@@ -177,12 +174,13 @@
}
return c;
}
+#endif
#define KWMATCH(p,kw) (strcasecmp((p), (kw)) == 0)
#define KWPREFIXMATCH(p,kw) (strncasecmp((p), (kw), sizeof((kw)) - 1) == 0)
#define EV_ALIAS(N,S) { .pm_alias = N, .pm_spec = S }
-#if __i386__
+#if defined(__i386__)
/*
* AMD K7 (Athlon) CPUs.
@@ -1238,7 +1236,7 @@
return -1 || pe || ctrspec || pmc_config; /* shut up gcc */
}
-#elif __amd64__
+#elif defined(__amd64__)
/*
* AMD K8 PMCs.
@@ -1636,7 +1634,7 @@
/* set parser pointer */
switch (cpu_info.pm_cputype) {
-#if __i386__
+#if defined(__i386__)
case PMC_CPU_AMD_K7:
pmc_mdep_event_aliases = k7_aliases;
pmc_mdep_allocate_pmc = k7_allocate_pmc;
@@ -1656,7 +1654,7 @@
pmc_mdep_event_aliases = p4_aliases;
pmc_mdep_allocate_pmc = p4_allocate_pmc;
break;
-#elif __amd64__
+#elif defined(__amd64__)
case PMC_CPU_AMD_K8:
pmc_mdep_event_aliases = k8_aliases;
pmc_mdep_allocate_pmc = k8_allocate_pmc;
@@ -2119,7 +2117,7 @@
* Architecture specific APIs
*/
-#if __i386__ || __amd64__
+#if defined(__i386__) || defined(__amd64__)
int
pmc_x86_get_msr(pmc_id_t pmc, uint32_t *msr)
==== //depot/projects/wifi/share/man/man9/Makefile#11 (text+ko) ====
@@ -1,9 +1,10 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.257 2005/04/15 10:57:34 pjd Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.258 2005/04/20 19:11:05 glebius Exp $
MAN= accept_filter.9 \
accf_data.9 \
accf_http.9 \
acl.9 \
+ alloc_unr.9 \
alq.9 \
altq.9 \
atomic.9 \
@@ -334,7 +335,11 @@
zero_copy.9 \
zone.9
-MLINKS= alq.9 ALQ.9 \
+MLINKS= alloc_unr.9 alloc_unrl.9 \
+ alloc_unr.9 delete_unrhdr.9 \
+ alloc_unr.9 free_unr.9 \
+ alloc_unr.9 new_unrhdr.9
+MLINKS+=alq.9 ALQ.9 \
alq.9 alq_close.9 \
alq.9 alq_flush.9 \
alq.9 alq_get.9 \
==== //depot/projects/wifi/sys/amd64/amd64/trap.c#3 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.282 2005/04/12 23:18:53 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.283 2005/04/20 20:52:45 ps Exp $");
/*
* AMD64 Trap and System call handling
@@ -623,7 +623,7 @@
}
#ifdef KDB
- if (kdb_trap(type, 0, frame))
+ if ((debugger_on_panic || kdb_active) && kdb_trap(type, 0, frame))
return;
#endif
printf("trap number = %d\n", type);
==== //depot/projects/wifi/sys/amd64/conf/NOTES#9 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.31 2005/04/19 22:16:46 imp Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.32 2005/04/20 22:19:51 marcel Exp $
#
#
@@ -56,19 +56,6 @@
#####################################################################
-# PERFORMANCE MONITORING OPTIONS
-
-#
-# The hwpmc driver that allows the use of in-CPU performance monitoring
-# counters for performance monitoring. The base kernel needs to configured
-# with the 'options' line, while the hwpmc device can be either compiled
-# in or loaded as a loadable kernel module.
-#
-device hwpmc # Driver (also a loadable module)
-options HWPMC_HOOKS # Other necessary kernel hooks
-
-
-#####################################################################
# NETWORKING OPTIONS
#
==== //depot/projects/wifi/sys/amd64/include/pmc_mdep.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.1 2005/04/19 04:01:22 jkoshy Exp $
+ * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.2 2005/04/20 20:22:33 marcel Exp $
*/
/* Machine dependent interfaces */
@@ -31,7 +31,7 @@
#ifndef _MACHINE_PMC_MDEP_H
#define _MACHINE_PMC_MDEP_H 1
-#include <sys/pmc.h>
+#include <machine/specialreg.h>
/* AMD K7 PMCs */
==== //depot/projects/wifi/sys/conf/NOTES#20 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1311 2005/04/19 22:16:45 imp Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1312 2005/04/20 22:19:51 marcel Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -422,6 +422,19 @@
#####################################################################
+# PERFORMANCE MONITORING OPTIONS
+
+#
+# The hwpmc driver that allows the use of in-CPU performance monitoring
+# counters for performance monitoring. The base kernel needs to configured
+# with the 'options' line, while the hwpmc device can be either compiled
+# in or loaded as a loadable kernel module.
+#
+device hwpmc # Driver (also a loadable module)
+options HWPMC_HOOKS # Other necessary kernel hooks
+
+
+#####################################################################
# NETWORKING OPTIONS
#
==== //depot/projects/wifi/sys/ddb/ddb.h#3 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/ddb/ddb.h,v 1.37 2004/11/01 22:15:14 jhb Exp $
+ * $FreeBSD: src/sys/ddb/ddb.h,v 1.38 2005/04/20 20:52:45 ps Exp $
*/
/*
@@ -71,7 +71,6 @@
extern int db_indent;
extern int db_inst_count;
extern int db_load_count;
-extern int debugger_on_panic;
extern int db_store_count;
extern db_expr_t db_radix;
extern db_expr_t db_max_width;
==== //depot/projects/wifi/sys/hwpmc/hwpmc_amd.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_amd.c,v 1.1 2005/04/19 04:01:23 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_amd.c,v 1.2 2005/04/20 20:26:39 marcel Exp $");
/* Support for the AMD K7 and later processors */
@@ -34,12 +34,11 @@
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
+#include <sys/pmc.h>
#include <sys/smp.h>
#include <sys/systm.h>
#include <machine/md_var.h>
-#include <machine/pmc_mdep.h>
-#include <machine/specialreg.h>
/* AMD K7 and K8 PMCs */
==== //depot/projects/wifi/sys/hwpmc/hwpmc_intel.c#2 (text+ko) ====
@@ -25,19 +25,18 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_intel.c,v 1.1 2005/04/19 04:01:23 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_intel.c,v 1.2 2005/04/20 20:26:39 marcel Exp $");
#include <sys/param.h>
#include <sys/lock.h>
#include <sys/mutex.h>
+#include <sys/pmc.h>
#include <sys/pmckern.h>
#include <sys/smp.h>
#include <sys/systm.h>
#include <machine/cputypes.h>
#include <machine/md_var.h>
-#include <machine/pmc_mdep.h>
-#include <machine/specialreg.h>
struct pmc_mdep *
pmc_intel_initialize(void)
==== //depot/projects/wifi/sys/hwpmc/hwpmc_mod.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_mod.c,v 1.2 2005/04/19 21:12:57 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_mod.c,v 1.4 2005/04/20 20:26:39 marcel Exp $");
#include <sys/param.h>
#include <sys/eventhandler.h>
@@ -50,8 +50,6 @@
#include <sys/systm.h>
#include <machine/md_var.h>
-#include <machine/pmc_mdep.h>
-#include <machine/specialreg.h>
/*
* Types
@@ -303,7 +301,7 @@
static int
pmc_debugflags_parse(char *newstr, char *fence)
{
- char c, *e, *p, *q;
+ char c, *p, *q;
unsigned int tmpflags;
int level;
char tmpbuf[4]; /* 3 character keyword + '\0' */
@@ -312,7 +310,6 @@
level = 0xF; /* max verbosity */
p = newstr;
- e = newstr + strlen(p);
for (; p < fence && (c = *p);) {
@@ -331,7 +328,7 @@
else if (strncmp(tmpbuf, S, 3) == 0) \
tmpflags |= __PMCDFMIN(F)
- if (e - p > 6 && strncmp(p, "level=", 6) == 0) {
+ if (fence - p > 6 && strncmp(p, "level=", 6) == 0) {
p += 6; /* skip over keyword */
level = strtoul(p, &q, 16);
}
==== //depot/projects/wifi/sys/hwpmc/hwpmc_pentium.c#2 (text+ko) ====
@@ -25,19 +25,18 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_pentium.c,v 1.1 2005/04/19 04:01:23 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_pentium.c,v 1.2 2005/04/20 20:26:39 marcel Exp $");
#include <sys/param.h>
#include <sys/lock.h>
#include <sys/mutex.h>
+#include <sys/pmc.h>
#include <sys/pmckern.h>
#include <sys/smp.h>
#include <sys/systm.h>
#include <machine/cputypes.h>
#include <machine/md_var.h>
-#include <machine/pmc_mdep.h>
-#include <machine/specialreg.h>
/*
* Intel Pentium PMCs
==== //depot/projects/wifi/sys/hwpmc/hwpmc_piv.c#2 (text+ko) ====
@@ -25,19 +25,18 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_piv.c,v 1.2 2005/04/19 21:40:49 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_piv.c,v 1.3 2005/04/20 20:26:39 marcel Exp $");
#include <sys/param.h>
#include <sys/lock.h>
#include <sys/mutex.h>
+#include <sys/pmc.h>
#include <sys/pmckern.h>
#include <sys/smp.h>
#include <sys/systm.h>
#include <machine/cputypes.h>
#include <machine/md_var.h>
-#include <machine/pmc_mdep.h>
-#include <machine/specialreg.h>
/*
* PENTIUM 4 SUPPORT
==== //depot/projects/wifi/sys/hwpmc/hwpmc_ppro.c#2 (text+ko) ====
@@ -25,19 +25,18 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_ppro.c,v 1.1 2005/04/19 04:01:23 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/sys/hwpmc/hwpmc_ppro.c,v 1.2 2005/04/20 20:26:39 marcel Exp $");
#include <sys/param.h>
#include <sys/lock.h>
#include <sys/mutex.h>
+#include <sys/pmc.h>
#include <sys/pmckern.h>
#include <sys/smp.h>
#include <sys/systm.h>
#include <machine/cputypes.h>
#include <machine/md_var.h>
-#include <machine/pmc_mdep.h>
-#include <machine/specialreg.h>
/*
* PENTIUM PRO SUPPORT
==== //depot/projects/wifi/sys/i386/conf/NOTES#14 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1195 2005/04/19 22:16:46 imp Exp $
+# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1196 2005/04/20 22:19:51 marcel Exp $
#
#
@@ -214,19 +214,6 @@
#####################################################################
-# PERFORMANCE MONITORING OPTIONS
-
-#
-# The hwpmc driver that allows the use of in-CPU performance monitoring
-# counters for performance monitoring. The base kernel needs to configured
-# with the 'options' line, while the hwpmc device can be either compiled
-# in or loaded as a loadable kernel module.
-#
-device hwpmc # Driver (also a loadable module)
-options HWPMC_HOOKS # Other necessary kernel hooks
-
-
-#####################################################################
# NETWORKING OPTIONS
#
==== //depot/projects/wifi/sys/i386/i386/trap.c#4 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.271 2005/04/12 23:18:54 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.272 2005/04/20 20:52:45 ps Exp $");
/*
* 386 Trap and System call handling
@@ -798,7 +798,7 @@
}
#ifdef KDB
- if (kdb_trap(type, 0, frame))
+ if ((debugger_on_panic || kdb_active) && kdb_trap(type, 0, frame))
return;
#endif
printf("trap number = %d\n", type);
==== //depot/projects/wifi/sys/i386/include/pmc_mdep.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/i386/include/pmc_mdep.h,v 1.1 2005/04/19 04:01:24 jkoshy Exp $
+ * $FreeBSD: src/sys/i386/include/pmc_mdep.h,v 1.2 2005/04/20 20:22:33 marcel Exp $
*/
/* Machine dependent interfaces */
@@ -31,7 +31,8 @@
#ifndef _MACHINE_PMC_MDEP_H
#define _MACHINE_PMC_MDEP_H 1
-#include <sys/pmc.h>
+#include <machine/cpufunc.h>
+#include <machine/specialreg.h>
/* AMD K7 PMCs */
==== //depot/projects/wifi/sys/kern/kern_pmc.c#2 (text+ko) ====
@@ -21,14 +21,11 @@
* 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 <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_pmc.c,v 1.1 2005/04/19 04:01:24 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_pmc.c,v 1.2 2005/04/20 20:30:59 marcel Exp $");
-#ifdef HWPMC_HOOKS
-
#include <sys/pmckern.h>
#include <sys/smp.h>
@@ -78,5 +75,3 @@
return 0;
#endif
}
-
-#endif /* HWPMC_HOOKS */
==== //depot/projects/wifi/sys/modules/Makefile#21 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.441 2005/04/20 04:57:38 jkoshy Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.442 2005/04/20 22:03:33 marcel Exp $
# oldcard -- specialized use for debugging only.
# owi -- totally unsupported for debugging only.
@@ -91,7 +91,7 @@
hifn \
hme \
${_hptmv} \
- ${_hwpmc} \
+ hwpmc \
${_i2c} \
${_ibcs2} \
${_ichwd} \
@@ -328,7 +328,6 @@
_ext2fs= ext2fs
_fe= fe
_hfa= hfa
-_hwpmc= hwpmc
_i2c= i2c
_ibcs2= ibcs2
_ie= ie
@@ -421,7 +420,6 @@
_drm= drm
_em= em
_ext2fs= ext2fs
-_hwpmc= hwpmc
_i2c= i2c
_ida= ida
_iir= iir
==== //depot/projects/wifi/sys/pc98/conf/NOTES#9 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.54 2005/04/19 22:16:46 imp Exp $
+# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.55 2005/04/20 22:19:51 marcel Exp $
#
#
@@ -177,19 +177,6 @@
#####################################################################
-# PERFORMANCE MONITORING OPTIONS
-
-#
-# The hwpmc driver that allows the use of in-CPU performance monitoring
-# counters for performance monitoring. The base kernel needs to configured
-# with the 'options' line, while the hwpmc device can be either compiled
-# in or loaded as a loadable kernel module.
-#
-device hwpmc # Driver (also a loadable module)
-options HWPMC_HOOKS # Other necessary kernel hooks
-
-
-#####################################################################
# NETWORKING OPTIONS
#
==== //depot/projects/wifi/sys/pc98/include/_bus.h#2 (text+ko) ====
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/pc98/include/_bus.h,v 1.1 2005/04/18 21:45:34 imp Exp $
+ * $FreeBSD: src/sys/pc98/include/_bus.h,v 1.3 2005/04/19 21:07:00 imp Exp $
*/
#ifndef PC98_INCLUDE__BUS_H
@@ -37,38 +37,7 @@
typedef u_int bus_addr_t;
typedef u_int bus_size_t;
-/*
- * Access methods for bus resources and address space.
- */
-struct bus_space_tag {
-#define BUS_SPACE_IO 0
-#define BUS_SPACE_MEM 1
- u_int bs_tag; /* bus space flags */
-
- struct bus_space_access_methods bs_da; /* direct access */
- struct bus_space_access_methods bs_ra; /* relocate access */
-#if 0
- struct bus_space_access_methods bs_ida; /* indexed direct access */
-#endif
-};
typedef struct bus_space_tag *bus_space_tag_t;
-
-/*
- * bus space handle
- */
-struct bus_space_handle {
- bus_addr_t bsh_base;
- size_t bsh_sz;
-
- bus_addr_t bsh_iat[BUS_SPACE_IAT_MAXSIZE];
- size_t bsh_maxiatsz;
- size_t bsh_iatsz;
-
- struct resource **bsh_res;
- size_t bsh_ressz;
-
- struct bus_space_access_methods bsh_bam;
-};
typedef struct bus_space_handle *bus_space_handle_t;
#endif /* PC98_INCLUDE__BUS_H */
==== //depot/projects/wifi/sys/powerpc/powerpc/trap.c#6 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.53 2005/04/12 23:18:54 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.54 2005/04/20 20:52:46 ps Exp $");
#include "opt_ktrace.h"
@@ -93,8 +93,6 @@
extern char *syscallnames[];
-extern int debugger_on_panic; /* XXX */
-
struct powerpc_exception {
u_int vector;
char *name;
==== //depot/projects/wifi/sys/sys/kdb.h#3 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/sys/kdb.h,v 1.4 2005/01/07 02:29:23 imp Exp $
+ * $FreeBSD: src/sys/sys/kdb.h,v 1.5 2005/04/20 20:52:46 ps Exp $
*/
#ifndef _SYS_KDB_H_
@@ -57,6 +57,7 @@
struct trapframe;
extern int kdb_active; /* Non-zero while in debugger. */
+extern int debugger_on_panic; /* enter the debugger on panic. */
extern struct kdb_dbbe *kdb_dbbe; /* Default debugger backend or NULL. */
extern struct trapframe *kdb_frame; /* Frame to kdb_trap(). */
extern struct pcb *kdb_thrctx; /* Current context. */
==== //depot/projects/wifi/sys/sys/pmc.h#2 (text+ko) ====
@@ -23,12 +23,14 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/sys/pmc.h,v 1.1 2005/04/19 04:01:25 jkoshy Exp $
+ * $FreeBSD: src/sys/sys/pmc.h,v 1.2 2005/04/20 20:19:24 marcel Exp $
*/
#ifndef _SYS_PMC_H_
#define _SYS_PMC_H_
+#include <machine/pmc_mdep.h>
+
#define PMC_MODULE_NAME "hwpmc"
#define PMC_NAME_MAX 16 /* HW counter name size */
#define PMC_CLASS_MAX 4 /* #classes of PMCs in a CPU */
@@ -1115,10 +1117,6 @@
} pm_amd;
} pm_md;
-#else
-
-#error Unsupported PMC architecture.
-
#endif
};
==== //depot/projects/wifi/usr.sbin/Makefile#10 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)Makefile 5.20 (Berkeley) 6/12/93
-# $FreeBSD: src/usr.sbin/Makefile,v 1.329 2005/04/19 14:27:43 jkoshy Exp $
+# $FreeBSD: src/usr.sbin/Makefile,v 1.330 2005/04/20 20:51:37 marcel Exp $
# XXX MISSING: mkproto
SUBDIR= ac \
@@ -113,8 +113,8 @@
${_pcvt} \
periodic \
pkg_install \
- ${_pmccontrol} \
- ${_pmcstat} \
+ pmccontrol \
+ pmcstat \
${_pnpinfo} \
powerd \
ppp \
@@ -287,8 +287,6 @@
_mptable= mptable
_ndiscvt= ndiscvt
_pccard= pccard
-_pmccontrol= pmccontrol
-_pmcstat= pmcstat
_pnpinfo= pnpinfo
.if !defined(NO_LIBPTHREAD)
_pppctl= pppctl
@@ -333,8 +331,6 @@
_mount_smbfs= mount_smbfs
_mptable= mptable
_ndiscvt= ndiscvt
-_pmccontrol= pmccontrol
-_pmcstat= pmcstat
.if !defined(NO_LIBPTHREAD)
_pppctl= pppctl
.endif
More information about the p4-projects
mailing list