PERFORCE change 60953 for review
John Baldwin
jhb at FreeBSD.org
Fri Sep 3 07:14:41 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=60953
Change 60953 by jhb at jhb_slimer on 2004/09/03 14:14:21
IFC @60947.
Affected files ...
.. //depot/projects/smpng/sys/alpha/alpha/pmap.c#63 integrate
.. //depot/projects/smpng/sys/alpha/alpha/trap.c#54 integrate
.. //depot/projects/smpng/sys/alpha/conf/GENERIC#40 integrate
.. //depot/projects/smpng/sys/alpha/conf/NOTES#9 integrate
.. //depot/projects/smpng/sys/alpha/include/cpu.h#12 integrate
.. //depot/projects/smpng/sys/alpha/include/param.h#11 integrate
.. //depot/projects/smpng/sys/alpha/include/profile.h#4 integrate
.. //depot/projects/smpng/sys/alpha/linux/linux_machdep.c#17 integrate
.. //depot/projects/smpng/sys/alpha/pci/pcibus.c#6 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#13 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mp_watchdog.c#1 branch
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#31 integrate
.. //depot/projects/smpng/sys/amd64/amd64/trap.c#22 integrate
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#22 integrate
.. //depot/projects/smpng/sys/amd64/conf/NOTES#9 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#7 integrate
.. //depot/projects/smpng/sys/amd64/include/mp_watchdog.h#1 branch
.. //depot/projects/smpng/sys/amd64/include/param.h#11 integrate
.. //depot/projects/smpng/sys/amd64/include/profile.h#7 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#3 integrate
.. //depot/projects/smpng/sys/arm/include/profile.h#4 integrate
.. //depot/projects/smpng/sys/boot/common/Makefile.inc#7 integrate
.. //depot/projects/smpng/sys/boot/common/bootstrap.h#8 integrate
.. //depot/projects/smpng/sys/boot/common/load_elf.c#12 integrate
.. //depot/projects/smpng/sys/boot/common/load_elf32_obj.c#1 branch
.. //depot/projects/smpng/sys/boot/common/load_elf64_obj.c#1 branch
.. //depot/projects/smpng/sys/boot/common/load_elf_obj.c#1 branch
.. //depot/projects/smpng/sys/boot/common/misc.c#3 integrate
.. //depot/projects/smpng/sys/boot/common/reloc_elf.c#1 branch
.. //depot/projects/smpng/sys/boot/common/reloc_elf32.c#1 branch
.. //depot/projects/smpng/sys/boot/common/reloc_elf64.c#1 branch
.. //depot/projects/smpng/sys/boot/i386/boot0/Makefile#10 integrate
.. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#16 integrate
.. //depot/projects/smpng/sys/boot/i386/boot2/boot1.S#5 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/elf32_freebsd.c#3 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/elf64_freebsd.c#4 integrate
.. //depot/projects/smpng/sys/boot/i386/loader/conf.c#9 integrate
.. //depot/projects/smpng/sys/boot/i386/mbr/Makefile#7 integrate
.. //depot/projects/smpng/sys/boot/i386/mbr/mbr.s#2 integrate
.. //depot/projects/smpng/sys/cam/cam_periph.c#16 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#55 integrate
.. //depot/projects/smpng/sys/coda/cnode.h#7 integrate
.. //depot/projects/smpng/sys/coda/coda_fbsd.c#10 integrate
.. //depot/projects/smpng/sys/coda/coda_psdev.c#14 integrate
.. //depot/projects/smpng/sys/coda/coda_vfsops.c#17 integrate
.. //depot/projects/smpng/sys/conf/Makefile.alpha#21 integrate
.. //depot/projects/smpng/sys/conf/Makefile.amd64#7 integrate
.. //depot/projects/smpng/sys/conf/Makefile.arm#2 integrate
.. //depot/projects/smpng/sys/conf/Makefile.i386#19 integrate
.. //depot/projects/smpng/sys/conf/Makefile.ia64#26 integrate
.. //depot/projects/smpng/sys/conf/Makefile.pc98#18 integrate
.. //depot/projects/smpng/sys/conf/Makefile.powerpc#24 integrate
.. //depot/projects/smpng/sys/conf/Makefile.sparc64#22 integrate
.. //depot/projects/smpng/sys/conf/NOTES#78 integrate
.. //depot/projects/smpng/sys/conf/files#119 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#22 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#64 integrate
.. //depot/projects/smpng/sys/conf/kmod.mk#34 integrate
.. //depot/projects/smpng/sys/conf/ldscript.alpha#5 integrate
.. //depot/projects/smpng/sys/conf/ldscript.ia64#8 integrate
.. //depot/projects/smpng/sys/conf/majors#40 integrate
.. //depot/projects/smpng/sys/conf/options#85 integrate
.. //depot/projects/smpng/sys/conf/options.amd64#9 integrate
.. //depot/projects/smpng/sys/conf/options.pc98#42 integrate
.. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.c#16 integrate
.. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.h#9 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdDebug.c#8 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_lid.c#15 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#19 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#28 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/ahc_isa.c#2 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.c#58 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.h#30 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#42 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-disk.c#43 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#19 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.h#24 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-queue.c#18 integrate
.. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#10 integrate
.. //depot/projects/smpng/sys/dev/bfe/if_bfereg.h#4 integrate
.. //depot/projects/smpng/sys/dev/ctau/if_ct.c#8 integrate
.. //depot/projects/smpng/sys/dev/cx/if_cx.c#12 integrate
.. //depot/projects/smpng/sys/dev/drm/radeon_drv.c#7 integrate
.. //depot/projects/smpng/sys/dev/em/if_em.c#35 integrate
.. //depot/projects/smpng/sys/dev/em/if_em.h#22 integrate
.. //depot/projects/smpng/sys/dev/em/if_em_hw.c#13 integrate
.. //depot/projects/smpng/sys/dev/em/if_em_hw.h#13 integrate
.. //depot/projects/smpng/sys/dev/fdc/fdc.c#7 integrate
.. //depot/projects/smpng/sys/dev/fdc/fdc_acpi.c#4 integrate
.. //depot/projects/smpng/sys/dev/fdc/fdc_isa.c#5 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwcrom.c#10 integrate
.. //depot/projects/smpng/sys/dev/hfa/fore_receive.c#9 integrate
.. //depot/projects/smpng/sys/dev/idt/idt_harp.c#5 integrate
.. //depot/projects/smpng/sys/dev/iir/iir.c#11 integrate
.. //depot/projects/smpng/sys/dev/md/md.c#54 integrate
.. //depot/projects/smpng/sys/dev/mpt/mpt_freebsd.c#11 integrate
.. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#13 integrate
.. //depot/projects/smpng/sys/dev/re/if_re.c#13 integrate
.. //depot/projects/smpng/sys/dev/tga/tga_pci.c#8 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_bus_isa.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#60 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdi.c#18 integrate
.. //depot/projects/smpng/sys/fs/autofs/autofs.h#1 branch
.. //depot/projects/smpng/sys/fs/autofs/autofs_util.c#1 branch
.. //depot/projects/smpng/sys/fs/autofs/autofs_vfsops.c#1 branch
.. //depot/projects/smpng/sys/fs/autofs/autofs_vnops.c#1 branch
.. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#33 integrate
.. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#32 integrate
.. //depot/projects/smpng/sys/geom/concat/g_concat.c#9 integrate
.. //depot/projects/smpng/sys/geom/geom.h#39 integrate
.. //depot/projects/smpng/sys/geom/geom_io.c#32 integrate
.. //depot/projects/smpng/sys/geom/label/g_label.c#5 integrate
.. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#4 integrate
.. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#3 integrate
.. //depot/projects/smpng/sys/geom/raid3/g_raid3_ctl.c#3 integrate
.. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#7 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#6 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum.h#3 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#5 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_volume.c#3 integrate
.. //depot/projects/smpng/sys/i386/bios/mca_machdep.c#4 integrate
.. //depot/projects/smpng/sys/i386/bios/vpd.c#5 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#55 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#89 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#68 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#69 integrate
.. //depot/projects/smpng/sys/i386/i386/trap.c#72 integrate
.. //depot/projects/smpng/sys/i386/include/in_cksum.h#7 integrate
.. //depot/projects/smpng/sys/i386/include/param.h#14 integrate
.. //depot/projects/smpng/sys/i386/include/profile.h#12 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#26 integrate
.. //depot/projects/smpng/sys/i4b/driver/i4b_ing.c#11 integrate
.. //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#18 integrate
.. //depot/projects/smpng/sys/i4b/driver/i4b_isppp.c#10 integrate
.. //depot/projects/smpng/sys/i4b/driver/i4b_rbch.c#15 integrate
.. //depot/projects/smpng/sys/i4b/driver/i4b_tel.c#13 integrate
.. //depot/projects/smpng/sys/i4b/driver/i4b_trace.c#14 integrate
.. //depot/projects/smpng/sys/i4b/layer4/i4b_i4bdrv.c#19 integrate
.. //depot/projects/smpng/sys/i4b/layer4/i4b_l4.c#8 integrate
.. //depot/projects/smpng/sys/ia64/conf/GENERIC#41 integrate
.. //depot/projects/smpng/sys/ia64/conf/NOTES#4 integrate
.. //depot/projects/smpng/sys/ia64/conf/SKI#18 integrate
.. //depot/projects/smpng/sys/ia64/ia64/exception.S#7 integrate
.. //depot/projects/smpng/sys/ia64/ia64/locore.S#4 integrate
.. //depot/projects/smpng/sys/ia64/ia64/pmap.c#61 integrate
.. //depot/projects/smpng/sys/ia64/ia64/support.S#4 integrate
.. //depot/projects/smpng/sys/ia64/ia64/syscall.S#9 integrate
.. //depot/projects/smpng/sys/ia64/ia64/trap.c#67 integrate
.. //depot/projects/smpng/sys/ia64/include/asm.h#8 integrate
.. //depot/projects/smpng/sys/ia64/include/cpu.h#23 integrate
.. //depot/projects/smpng/sys/ia64/include/profile.h#8 integrate
.. //depot/projects/smpng/sys/isa/psm.c#29 integrate
.. //depot/projects/smpng/sys/kern/init_main.c#47 integrate
.. //depot/projects/smpng/sys/kern/kern_conf.c#29 integrate
.. //depot/projects/smpng/sys/kern/kern_fork.c#82 integrate
.. //depot/projects/smpng/sys/kern/kern_idle.c#23 integrate
.. //depot/projects/smpng/sys/kern/kern_intr.c#51 integrate
.. //depot/projects/smpng/sys/kern/kern_kse.c#8 integrate
.. //depot/projects/smpng/sys/kern/kern_kthread.c#14 integrate
.. //depot/projects/smpng/sys/kern/kern_linker.c#38 integrate
.. //depot/projects/smpng/sys/kern/kern_lock.c#34 integrate
.. //depot/projects/smpng/sys/kern/kern_mutex.c#86 integrate
.. //depot/projects/smpng/sys/kern/kern_prot.c#84 integrate
.. //depot/projects/smpng/sys/kern/kern_shutdown.c#49 integrate
.. //depot/projects/smpng/sys/kern/kern_sig.c#96 integrate
.. //depot/projects/smpng/sys/kern/kern_switch.c#43 integrate
.. //depot/projects/smpng/sys/kern/kern_thr.c#19 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#65 integrate
.. //depot/projects/smpng/sys/kern/link_elf_obj.c#5 integrate
.. //depot/projects/smpng/sys/kern/sched_4bsd.c#35 integrate
.. //depot/projects/smpng/sys/kern/sched_ule.c#39 integrate
.. //depot/projects/smpng/sys/kern/subr_bus.c#40 integrate
.. //depot/projects/smpng/sys/kern/subr_smp.c#37 integrate
.. //depot/projects/smpng/sys/kern/subr_trap.c#69 integrate
.. //depot/projects/smpng/sys/kern/subr_turnstile.c#15 integrate
.. //depot/projects/smpng/sys/kern/sys_generic.c#35 integrate
.. //depot/projects/smpng/sys/kern/sysv_shm.c#25 integrate
.. //depot/projects/smpng/sys/kern/uipc_usrreq.c#40 integrate
.. //depot/projects/smpng/sys/kern/vfs_aio.c#49 integrate
.. //depot/projects/smpng/sys/libkern/mcount.c#6 integrate
.. //depot/projects/smpng/sys/modules/Makefile#81 integrate
.. //depot/projects/smpng/sys/modules/aac/Makefile#5 integrate
.. //depot/projects/smpng/sys/modules/autofs/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/bridge/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/cam/Makefile#9 integrate
.. //depot/projects/smpng/sys/modules/coda/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/coda5/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/cp/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/ctau/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/cx/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/if_ppp/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/if_tap/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/ipfw/Makefile#6 integrate
.. //depot/projects/smpng/sys/modules/pf/Makefile#5 integrate
.. //depot/projects/smpng/sys/net/bridge.c#29 integrate
.. //depot/projects/smpng/sys/net/if.c#53 integrate
.. //depot/projects/smpng/sys/net/if.h#20 integrate
.. //depot/projects/smpng/sys/net/if_loop.c#33 integrate
.. //depot/projects/smpng/sys/net/if_ppp.c#29 integrate
.. //depot/projects/smpng/sys/net/if_sl.c#25 integrate
.. //depot/projects/smpng/sys/net/if_spppsubr.c#21 integrate
.. //depot/projects/smpng/sys/net/netisr.c#8 integrate
.. //depot/projects/smpng/sys/net/rtsock.c#39 integrate
.. //depot/projects/smpng/sys/netgraph/atm/atmpif/ng_atmpif_harp.c#2 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#23 integrate
.. //depot/projects/smpng/sys/netgraph/ng_socket.c#24 integrate
.. //depot/projects/smpng/sys/netgraph/ng_tty.c#12 integrate
.. //depot/projects/smpng/sys/netinet/ip_dummynet.c#33 integrate
.. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#9 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#38 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#2 integrate
.. //depot/projects/smpng/sys/netinet/ip_input.c#57 integrate
.. //depot/projects/smpng/sys/netinet/ip_mroute.c#37 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#63 integrate
.. //depot/projects/smpng/sys/netinet/ip_var.h#24 integrate
.. //depot/projects/smpng/sys/netinet6/ah_input.c#12 integrate
.. //depot/projects/smpng/sys/netinet6/esp_input.c#17 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_forward.c#11 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_input.c#35 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_output.c#34 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_var.h#13 integrate
.. //depot/projects/smpng/sys/netinet6/ipsec.c#17 integrate
.. //depot/projects/smpng/sys/netinet6/raw_ip6.c#29 integrate
.. //depot/projects/smpng/sys/netipsec/ipsec_input.c#8 integrate
.. //depot/projects/smpng/sys/netipsec/xform_ipip.c#9 integrate
.. //depot/projects/smpng/sys/netipx/ipx.c#8 integrate
.. //depot/projects/smpng/sys/netkey/key.c#25 integrate
.. //depot/projects/smpng/sys/netkey/keysock.c#20 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#28 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#34 integrate
.. //depot/projects/smpng/sys/pc98/conf/GENERIC#47 integrate
.. //depot/projects/smpng/sys/pc98/conf/NOTES#31 integrate
.. //depot/projects/smpng/sys/pc98/pc98/atapi.c#5 integrate
.. //depot/projects/smpng/sys/pc98/pc98/wd.c#16 integrate
.. //depot/projects/smpng/sys/pci/if_dc.c#59 integrate
.. //depot/projects/smpng/sys/pci/if_pcn.c#27 integrate
.. //depot/projects/smpng/sys/pci/if_rlreg.h#19 integrate
.. //depot/projects/smpng/sys/pci/if_sf.c#30 integrate
.. //depot/projects/smpng/sys/pci/if_ste.c#32 integrate
.. //depot/projects/smpng/sys/pci/if_ti.c#39 integrate
.. //depot/projects/smpng/sys/pci/if_tl.c#23 integrate
.. //depot/projects/smpng/sys/pci/if_wb.c#26 integrate
.. //depot/projects/smpng/sys/powerpc/conf/GENERIC#24 integrate
.. //depot/projects/smpng/sys/powerpc/include/pmap.h#15 integrate
.. //depot/projects/smpng/sys/powerpc/include/profile.h#3 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#46 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#39 integrate
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#45 integrate
.. //depot/projects/smpng/sys/sparc64/include/profile.h#5 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#58 integrate
.. //depot/projects/smpng/sys/sys/bio.h#22 integrate
.. //depot/projects/smpng/sys/sys/kernel.h#25 integrate
.. //depot/projects/smpng/sys/sys/linker.h#14 integrate
.. //depot/projects/smpng/sys/sys/param.h#70 integrate
.. //depot/projects/smpng/sys/sys/proc.h#124 integrate
.. //depot/projects/smpng/sys/sys/sched.h#13 integrate
.. //depot/projects/smpng/sys/sys/smp.h#12 integrate
.. //depot/projects/smpng/sys/sys/systm.h#55 integrate
.. //depot/projects/smpng/sys/sys/ucred.h#24 integrate
.. //depot/projects/smpng/sys/vm/vm_fault.c#40 integrate
.. //depot/projects/smpng/sys/vm/vm_glue.c#48 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#67 integrate
.. //depot/projects/smpng/sys/vm/vm_mmap.c#48 integrate
.. //depot/projects/smpng/sys/vm/vm_object.c#58 integrate
.. //depot/projects/smpng/sys/vm/vm_zeroidle.c#18 integrate
Differences ...
==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#63 (text+ko) ====
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.166 2004/08/15 20:54:25 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.168 2004/08/27 19:06:16 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -747,8 +747,6 @@
vm_paddr_t pa;
pa = 0;
- if (pmap == NULL)
- return (pa);
PMAP_LOCK(pmap);
pte = pmap_lev3pte(pmap, va);
if (pte != NULL && pmap_pte_v(pte))
@@ -771,8 +769,6 @@
vm_page_t m;
m = NULL;
- if (pmap == NULL)
- return (m);
vm_page_lock_queues();
PMAP_LOCK(pmap);
pte = pmap_lev3pte(pmap, va);
@@ -1468,9 +1464,6 @@
{
vm_offset_t va, nva;
- if (pmap == NULL)
- return;
-
/*
* Perform an unsynchronized read. This is, however, safe.
*/
@@ -1586,9 +1579,6 @@
pt_entry_t* pte;
int newprot;
- if (pmap == NULL)
- return;
-
if ((prot & VM_PROT_READ) == VM_PROT_NONE) {
pmap_remove(pmap, sva, eva);
return;
@@ -1681,9 +1671,6 @@
vm_page_t mpte;
int managed;
- if (pmap == NULL)
- return;
-
va &= ~PAGE_MASK;
#ifdef PMAP_DIAGNOSTIC
if (va > VM_MAX_KERNEL_ADDRESS)
@@ -1965,9 +1952,6 @@
{
pt_entry_t *pte;
- if (pmap == NULL)
- return;
-
PMAP_LOCK(pmap);
pte = pmap_lev3pte(pmap, va);
@@ -2110,7 +2094,7 @@
pv_entry_t pv, npv;
#ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY
- if (!curthread || (pmap != vmspace_pmap(curthread->td_proc->p_vmspace))) {
+ if (pmap != vmspace_pmap(curthread->td_proc->p_vmspace)) {
printf("warning: pmap_remove_pages called with non-current pmap\n");
return;
}
==== //depot/projects/smpng/sys/alpha/alpha/trap.c#54 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.118 2004/07/10 22:35:05 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.120 2004/08/31 07:34:53 julian Exp $");
/* #include "opt_fix_unaligned_vax_fp.h" */
#include "opt_ddb.h"
@@ -591,9 +591,6 @@
framep->tf_regs[FRAME_SP] = alpha_pal_rdusp();
userret(td, framep, sticks);
mtx_assert(&Giant, MA_NOTOWNED);
-#ifdef DIAGNOSTIC
- cred_free_thread(td);
-#endif
}
return;
@@ -665,7 +662,7 @@
if (td->td_ucred != p->p_ucred)
cred_update_thread(td);
if (p->p_flag & P_SA)
- thread_user_enter(p, td);
+ thread_user_enter(td);
#ifdef DIAGNOSTIC
alpha_fpstate_check(td);
#endif
@@ -785,9 +782,6 @@
PTRACESTOP_SC(p, td, S_PT_SCX);
-#ifdef DIAGNOSTIC
- cred_free_thread(td);
-#endif
WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning",
(code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???");
mtx_assert(&sched_lock, MA_NOTOWNED);
==== //depot/projects/smpng/sys/alpha/conf/GENERIC#40 (text+ko) ====
@@ -18,7 +18,7 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.174 2004/08/03 19:24:52 markm Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.177 2004/08/30 18:40:00 wilko Exp $
machine alpha
cpu EV4
@@ -41,7 +41,8 @@
options DEC_ST550 # Personal Workstation 433, 500, 600
options DEC_ST6600 # XP1000, DP264, DS20, DS10, family
options DEC_1000A # AlphaServer 1000, 1000A, 800
-options DEC_KN8AE # AlphaServer 8200/8400 (Turbolaser)
+# TurboLaser support is broken
+# options DEC_KN8AE # AlphaServer 8200/8400 (Turbolaser)
options DEC_KN300 # AlphaServer 4100 (Rawhide),
# AlphaServer 1200 (Tincup)
@@ -69,7 +70,6 @@
options SYSVMSG #SYSV-style message queues
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
-options PFIL_HOOKS # pfil(9) framework
# Debugging for use in -current
options KDB #Enable kernel debugger support
@@ -153,6 +153,7 @@
# PCI Ethernet NICs.
device de # DEC/Intel DC21x4x (``Tulip'')
+device em # Intel PRO/1000 adapter Gigabit Ethernet Card
device txp # 3Com 3cR990 (``Typhoon'')
device vx # 3Com 3c590, 3c595 (``Vortex'')
==== //depot/projects/smpng/sys/alpha/conf/NOTES#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.154 2004/07/10 22:29:40 marcel Exp $
+# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.155 2004/08/28 21:47:24 wilko Exp $
#
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
@@ -36,7 +36,8 @@
options DEC_ST550 # Personal Workstation 433, 500, 600
options DEC_ST6600 # XP1000, DP264, DS20, DS10, family
options DEC_1000A # AlphaServer 1000, 1000A, 800
-options DEC_KN8AE # AlphaServer 8200/8400 (Turbolaser)
+# TurboLaser support is broken
+# options DEC_KN8AE # AlphaServer 8200/8400 (Turbolaser)
options DEC_KN300 # AlphaServer 4100 (Rawhide),
# AlphaServer 1200 (Tincup)
==== //depot/projects/smpng/sys/alpha/include/cpu.h#12 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.40 2004/08/03 18:44:26 mux Exp $ */
+/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.41 2004/08/27 19:20:42 marcel Exp $ */
/* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */
/*
@@ -92,6 +92,11 @@
#ifdef _KERNEL
+#ifdef GPROF
+extern char btext[];
+extern char etext[];
+#endif
+
#define cpu_getstack(td) (alpha_pal_rdusp())
#define cpu_spinwait() /* nothing */
#define get_cyclecount alpha_rpcc
==== //depot/projects/smpng/sys/alpha/include/param.h#11 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/param.h,v 1.35 2004/08/01 14:31:45 scottl Exp $ */
+/* $FreeBSD: src/sys/alpha/include/param.h,v 1.36 2004/09/02 18:59:14 scottl Exp $ */
/* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */
/*
@@ -113,11 +113,6 @@
#define SSIZE 1 /* initial stack size/NBPG */
#define SINCR 1 /* increment of stack/NBPG */
-/* PREEMPTION exposes scheduler bugs that need to be fixed. */
-#if 0
-#define PREEMPTION
-#endif
-
#ifndef KSTACK_PAGES
#define KSTACK_PAGES 2 /* pages of kstack (with pcb) */
#endif
==== //depot/projects/smpng/sys/alpha/include/profile.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/profile.h,v 1.6 2004/05/19 15:41:25 bde Exp $ */
+/* $FreeBSD: src/sys/alpha/include/profile.h,v 1.7 2004/08/27 19:42:34 marcel Exp $ */
/* From: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp */
/*
@@ -215,11 +215,27 @@
*
* XXX These macros should probably use inline assembly.
*/
-#define MCOUNT_ENTER(s) \
- s = _alpha_pal_swpipl(ALPHA_PSL_IPL_HIGH)
-#define MCOUNT_EXIT(s) \
- (void)_alpha_pal_swpipl(s);
-#define MCOUNT_DECL(s) u_long s;
+u_long _alpha_pal_swpipl(u_long);
+
+#define MCOUNT_ENTER(s) s = _alpha_pal_swpipl(ALPHA_PSL_IPL_HIGH)
+#define MCOUNT_EXIT(s) (void)_alpha_pal_swpipl(s)
+#define MCOUNT_DECL(s) u_long s;
+
+void bintr(void);
+void btrap(void);
+void eintr(void);
+void user(void);
+
+#define MCOUNT_FROMPC_USER(pc) \
+ ((pc < (uintfptr_t)VM_MAXUSER_ADDRESS) ? (uintfptr_t)user : pc)
+
+#define MCOUNT_FROMPC_INTR(pc) \
+ ((pc >= (uintfptr_t)btrap && pc < (uintfptr_t)eintr) ? \
+ ((pc >= (uintfptr_t)bintr) ? (uintfptr_t)bintr : \
+ (uintfptr_t)btrap) : ~0UL)
+
+_MCOUNT_DECL(uintfptr_t, uintfptr_t);
+
#else /* !_KERNEL */
typedef u_long uintfptr_t;
#endif
==== //depot/projects/smpng/sys/alpha/linux/linux_machdep.c#17 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.33 2004/02/04 21:52:52 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.34 2004/09/01 02:11:27 julian Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -180,7 +180,7 @@
*/
mtx_lock_spin(&sched_lock);
TD_SET_CAN_RUN(td2);
- setrunqueue(td2);
+ setrunqueue(td2, SRQ_BORING);
mtx_unlock_spin(&sched_lock);
td->td_retval[0] = p2->p_pid;
==== //depot/projects/smpng/sys/alpha/pci/pcibus.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.34 2004/07/01 15:07:27 gallatin Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.35 2004/08/29 19:07:14 marcel Exp $");
#include "opt_isa.h"
@@ -262,7 +262,7 @@
else if (flags & PCI_RF_BWX)
va = ALPHAPCI_CVT_BWX(bus, rv->r_start);
else
- va = (void *) rv->r_start; /* maybe NULL? */
+ va = (void *)ALPHA_PHYS_TO_K0SEG(rv->r_start);
rman_set_virtual(rv, va);
break;
==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#13 (text+ko) ====
@@ -25,10 +25,11 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.243 2004/08/23 21:39:28 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.246 2004/09/01 06:42:01 julian Exp $");
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
+#include "opt_mp_watchdog.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,6 +57,7 @@
#include <machine/apicreg.h>
#include <machine/clock.h>
#include <machine/md_var.h>
+#include <machine/mp_watchdog.h>
#include <machine/pcb.h>
#include <machine/psl.h>
#include <machine/smp.h>
@@ -111,7 +113,6 @@
*/
static u_int logical_cpus;
-static u_int logical_cpus_mask;
/* used to hold the AP's until we are ready to release them */
static struct mtx ap_boot_mtx;
@@ -136,7 +137,6 @@
static int start_ap(int apic_id);
static void release_aps(void *dummy);
-static int hlt_cpus_mask;
static int hlt_logical_cpus;
static struct sysctl_ctx_list logical_cpu_clist;
static u_int bootMP_size;
@@ -708,7 +708,7 @@
ncpu = mp_ncpus - 1; /* does not shootdown self */
if (ncpu < 1)
return; /* no other cpus */
- mtx_assert(&smp_rv_mtx, MA_OWNED);
+ mtx_assert(&smp_ipi_mtx, MA_OWNED);
smp_tlb_addr1 = addr1;
smp_tlb_addr2 = addr2;
atomic_store_rel_int(&smp_tlb_wait, 0);
@@ -794,7 +794,7 @@
if (ncpu < 1)
return;
}
- mtx_assert(&smp_rv_mtx, MA_OWNED);
+ mtx_assert(&smp_ipi_mtx, MA_OWNED);
smp_tlb_addr1 = addr1;
smp_tlb_addr2 = addr2;
atomic_store_rel_int(&smp_tlb_wait, 0);
@@ -1067,8 +1067,15 @@
mp_grab_cpu_hlt(void)
{
u_int mask = PCPU_GET(cpumask);
+#ifdef MP_WATCHDOG
+ u_int cpuid = PCPU_GET(cpuid);
+#endif
int retval;
+#ifdef MP_WATCHDOG
+ ap_watchdog(cpuid);
+#endif
+
retval = mask & hlt_cpus_mask;
while (mask & hlt_cpus_mask)
__asm __volatile("sti; hlt" : : : "memory");
==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#31 (text+ko) ====
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.493 2004/08/24 00:17:52 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.496 2004/08/30 03:52:04 alc Exp $");
/*
* Manages physical address maps.
@@ -631,7 +631,7 @@
if (smp_started) {
if (!(read_rflags() & PSL_I))
panic("%s: interrupts disabled", __func__);
- mtx_lock_spin(&smp_rv_mtx);
+ mtx_lock_spin(&smp_ipi_mtx);
} else
critical_enter();
/*
@@ -652,7 +652,7 @@
smp_masked_invlpg(pmap->pm_active & other_cpus, va);
}
if (smp_started)
- mtx_unlock_spin(&smp_rv_mtx);
+ mtx_unlock_spin(&smp_ipi_mtx);
else
critical_exit();
}
@@ -667,7 +667,7 @@
if (smp_started) {
if (!(read_rflags() & PSL_I))
panic("%s: interrupts disabled", __func__);
- mtx_lock_spin(&smp_rv_mtx);
+ mtx_lock_spin(&smp_ipi_mtx);
} else
critical_enter();
/*
@@ -691,7 +691,7 @@
sva, eva);
}
if (smp_started)
- mtx_unlock_spin(&smp_rv_mtx);
+ mtx_unlock_spin(&smp_ipi_mtx);
else
critical_exit();
}
@@ -705,7 +705,7 @@
if (smp_started) {
if (!(read_rflags() & PSL_I))
panic("%s: interrupts disabled", __func__);
- mtx_lock_spin(&smp_rv_mtx);
+ mtx_lock_spin(&smp_ipi_mtx);
} else
critical_enter();
/*
@@ -726,7 +726,7 @@
smp_masked_invltlb(pmap->pm_active & other_cpus);
}
if (smp_started)
- mtx_unlock_spin(&smp_rv_mtx);
+ mtx_unlock_spin(&smp_ipi_mtx);
else
critical_exit();
}
@@ -786,8 +786,6 @@
pd_entry_t pde, *pdep;
rtval = 0;
- if (pmap == NULL)
- return (rtval);
PMAP_LOCK(pmap);
pdep = pmap_pde(pmap, va);
if (pdep != NULL) {
@@ -821,8 +819,6 @@
vm_page_t m;
m = NULL;
- if (pmap == NULL)
- return (m);
vm_page_lock_queues();
PMAP_LOCK(pmap);
pdep = pmap_pde(pmap, va);
@@ -1563,9 +1559,6 @@
pt_entry_t *pte;
int anyvalid;
- if (pmap == NULL)
- return;
-
/*
* Perform an unsynchronized read. This is, however, safe.
*/
@@ -1737,9 +1730,6 @@
pd_entry_t ptpaddr, *pde;
int anychanged;
- if (pmap == NULL)
- return;
-
if ((prot & VM_PROT_READ) == VM_PROT_NONE) {
pmap_remove(pmap, sva, eva);
return;
@@ -1856,9 +1846,6 @@
pt_entry_t origpte, newpte;
vm_page_t mpte;
- if (pmap == NULL)
- return;
-
va = trunc_page(va);
#ifdef PMAP_DIAGNOSTIC
if (va > VM_MAX_KERNEL_ADDRESS)
@@ -2211,9 +2198,6 @@
{
register pt_entry_t *pte;
- if (pmap == NULL)
- return;
-
/*
* Wiring is not a hardware characteristic so there is no need to
* invalidate TLB.
@@ -2467,7 +2451,7 @@
pv_entry_t pv, npv;
#ifdef PMAP_REMOVE_PAGES_CURPROC_ONLY
- if (!curthread || (pmap != vmspace_pmap(curthread->td_proc->p_vmspace))) {
+ if (pmap != vmspace_pmap(curthread->td_proc->p_vmspace)) {
printf("warning: pmap_remove_pages called with non-current pmap\n");
return;
}
==== //depot/projects/smpng/sys/amd64/amd64/trap.c#22 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.279 2004/08/16 22:56:20 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.281 2004/08/31 07:34:53 julian Exp $");
/*
* AMD64 Trap and System call handling
@@ -259,7 +259,7 @@
case T_PAGEFLT: /* page fault */
if (td->td_pflags & TDP_SA)
- thread_user_enter(p, td);
+ thread_user_enter(td);
i = trap_pfault(&frame, TRUE);
if (i == -1)
goto userout;
@@ -471,9 +471,6 @@
userret(td, &frame, sticks);
mtx_assert(&Giant, MA_NOTOWNED);
userout:
-#ifdef DIAGNOSTIC
- cred_free_thread(td);
-#endif
out:
return;
}
@@ -698,7 +695,7 @@
if (td->td_ucred != p->p_ucred)
cred_update_thread(td);
if (p->p_flag & P_SA)
- thread_user_enter(p, td);
+ thread_user_enter(td);
params = (caddr_t)frame.tf_rsp + sizeof(register_t);
code = frame.tf_rax;
orig_tf_rflags = frame.tf_rflags;
@@ -830,9 +827,6 @@
PTRACESTOP_SC(p, td, S_PT_SCX);
-#ifdef DIAGNOSTIC
- cred_free_thread(td);
-#endif
WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning",
(code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???");
mtx_assert(&sched_lock, MA_NOTOWNED);
==== //depot/projects/smpng/sys/amd64/conf/GENERIC#22 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.421 2004/08/16 22:59:24 peter Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.422 2004/08/27 15:16:21 andre Exp $
machine amd64
cpu HAMMER
@@ -57,7 +57,6 @@
# output. Adds ~128k to driver.
options AHD_REG_PRETTY_PRINT # Print register bitfields in debug
# output. Adds ~215k to driver.
-options PFIL_HOOKS # pfil(9) framework
options ADAPTIVE_GIANT # Giant mutex is adaptive.
# Debugging for use in -current
==== //depot/projects/smpng/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.18 2004/08/16 12:39:27 tjr Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.19 2004/08/27 21:29:20 arved Exp $
#
#
@@ -468,7 +468,7 @@
# Enable Linux ABI emulation
#XXX#options COMPAT_LINUX
-# Enable 32-bit Linux ABI emulation (requires COMPAT_43 and IA32)
+# Enable 32-bit Linux ABI emulation (requires COMPAT_43 and COMPAT_IA32)
options COMPAT_LINUX32
# Enable the linux-like proc filesystem support (requires COMPAT_LINUX32
==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#7 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.6 2003/11/17 08:58:14 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.7 2004/08/31 06:12:12 julian Exp $");
/*
* 386 Trap and System call handling
@@ -247,9 +247,6 @@
*/
STOPEVENT(p, S_SCX, code);
-#ifdef DIAGNOSTIC
- cred_free_thread(td);
-#endif
WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning",
(code >= 0 && code < SYS_MAXSYSCALL) ? freebsd32_syscallnames[code] : "???");
mtx_assert(&sched_lock, MA_NOTOWNED);
==== //depot/projects/smpng/sys/amd64/include/param.h#11 (text+ko) ====
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)param.h 8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/amd64/include/param.h,v 1.13 2004/08/01 14:31:45 scottl Exp $
+ * $FreeBSD: src/sys/amd64/include/param.h,v 1.14 2004/09/02 18:59:14 scottl Exp $
*/
/*
@@ -119,11 +119,6 @@
#define NBPML4 (1ul<<PML4SHIFT)/* bytes/page map lev4 table */
#define PML4MASK (NBPML4-1)
-/* PREEMPTION exposes scheduler bugs that need to be fixed. */
-#if 0
-#define PREEMPTION
-#endif
-
#define IOPAGES 2 /* pages of i/o permission bitmap */
#ifndef KSTACK_PAGES
==== //depot/projects/smpng/sys/amd64/include/profile.h#7 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)profile.h 8.1 (Berkeley) 6/11/93
- * $FreeBSD: src/sys/amd64/include/profile.h,v 1.41 2004/07/29 18:02:28 kan Exp $
+ * $FreeBSD: src/sys/amd64/include/profile.h,v 1.42 2004/08/27 19:42:34 marcel Exp $
*/
#ifndef _MACHINE_PROFILE_H_
@@ -87,6 +87,19 @@
#endif
#endif /* GUPROF */
+void bintr(void);
+void btrap(void);
+void eintr(void);
+void user(void);
+
+#define MCOUNT_FROMPC_USER(pc) \
+ ((pc < (uintfptr_t)VM_MAXUSER_ADDRESS) ? (uintfptr_t)user : pc)
+
+#define MCOUNT_FROMPC_INTR(pc) \
+ ((pc >= (uintfptr_t)btrap && pc < (uintfptr_t)eintr) ? \
+ ((pc >= (uintfptr_t)bintr) ? (uintfptr_t)bintr : \
+ (uintfptr_t)btrap) : ~0UL)
+
#else /* !_KERNEL */
#define FUNCTION_ALIGNMENT 4
==== //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#3 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.3 2004/08/24 20:52:52 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.4 2004/09/01 02:11:27 julian Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -503,7 +503,7 @@
*/
mtx_lock_spin(&sched_lock);
TD_SET_CAN_RUN(td2);
- setrunqueue(td2);
+ setrunqueue(td2, SRQ_BORING);
mtx_unlock_spin(&sched_lock);
td->td_retval[0] = p2->p_pid;
==== //depot/projects/smpng/sys/arm/include/profile.h#4 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)profile.h 8.1 (Berkeley) 6/11/93
- * $FreeBSD: src/sys/arm/include/profile.h,v 1.3 2004/07/20 22:38:46 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/profile.h,v 1.4 2004/08/27 19:42:34 marcel Exp $
*/
#ifndef _MACHINE_PROFILE_H_
@@ -72,6 +72,19 @@
#endif
#endif /* GUPROF */
+void bintr(void);
+void btrap(void);
+void eintr(void);
+void user(void);
+
+#define MCOUNT_FROMPC_USER(pc) \
+ ((pc < (uintfptr_t)VM_MAXUSER_ADDRESS) ? (uintfptr_t)user : pc)
+
+#define MCOUNT_FROMPC_INTR(pc) \
+ ((pc >= (uintfptr_t)btrap && pc < (uintfptr_t)eintr) ? \
+ ((pc >= (uintfptr_t)bintr) ? (uintfptr_t)bintr : \
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list