PERFORCE change 111539 for review
Marko Zec
zec at FreeBSD.org
Tue Dec 12 03:36:42 PST 2006
http://perforce.freebsd.org/chv.cgi?CH=111539
Change 111539 by zec at zec_tca51 on 2006/12/12 11:15:34
IFC @ 11537.
Affected files ...
.. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/vimage/src/sys/amd64/include/pmap.h#2 integrate
.. //depot/projects/vimage/src/sys/amd64/isa/clock.c#2 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate
.. //depot/projects/vimage/src/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/vimage/src/sys/arm/at91/kb920x_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/arm/at91/uart_dev_at91usart.c#2 integrate
.. //depot/projects/vimage/src/sys/arm/sa11x0/assabet_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/i80321/i80321_space.c#2 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate
.. //depot/projects/vimage/src/sys/boot/i386/btx/btx/btx.S#2 integrate
.. //depot/projects/vimage/src/sys/cam/cam_ccb.h#2 integrate
.. //depot/projects/vimage/src/sys/cam/cam_periph.c#2 integrate
.. //depot/projects/vimage/src/sys/cam/cam_xpt.c#2 integrate
.. //depot/projects/vimage/src/sys/cam/cam_xpt.h#2 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_all.h#2 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_cd.c#2 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_ch.c#2 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_da.c#2 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_pass.c#2 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_pt.c#2 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_sa.c#2 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_ses.c#2 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_targ_bh.c#2 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_target.c#2 integrate
.. //depot/projects/vimage/src/sys/compat/linsysfs/linsysfs.c#2 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#2 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_stats.c#2 integrate
.. //depot/projects/vimage/src/sys/conf/NOTES#2 integrate
.. //depot/projects/vimage/src/sys/conf/files#3 integrate
.. //depot/projects/vimage/src/sys/conf/options#3 integrate
.. //depot/projects/vimage/src/sys/ddb/db_ps.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/aac/aac_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/advansys/adv_eisa.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/advansys/adv_isa.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/advansys/adv_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/advansys/advansys.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/advansys/adw_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/advansys/adwcam.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/aha/aha.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/aha/aha_isa.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/aha/aha_mca.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ahb/ahb.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/amd/amd.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/amr/amr_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/arcmsr/arcmsr.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/asr/asr.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/awi/awivar.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/bge/if_bgereg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/buslogic/bt.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/buslogic/bt_eisa.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/buslogic/bt_isa.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/buslogic/bt_mca.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/buslogic/bt_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/dc/if_dc.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/dc/if_dcreg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/dpt/dpt_eisa.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/dpt/dpt_isa.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/dpt/dpt_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ep/if_ep.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/esp/esp_sbus.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/firewire/fwdev.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/gem/if_gem.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/gem/if_gemvar.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/hme/if_hme.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/hme/if_hmevar.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/iicbus/iicbb.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/iicbus/iicbus_if.m#2 integrate
.. //depot/projects/vimage/src/sys/dev/iicbus/iiconf.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/iicbus/iiconf.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/iir/iir_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ipmi/ipmi.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_sbus.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_target.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/isp/ispmbox.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/isp/ispvar.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ispfw/ispfw.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/le/am7990.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/le/am79900.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/le/lance.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/le/lancevar.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/acphy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/amphy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/bmtphy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/brgphy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/ciphy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/e1000phy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/e1000phyreg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/inphy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/ip1000phy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/lxtphy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/mii_physubr.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/miidevs#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/miivar.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/mlphy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/nsgphy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/nsphy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/pnaphy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/qsphy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/rlphy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/tdkphy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/tlphy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/xmphy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mly/mly.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt_cam.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt_debug.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt_raid.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/nve/if_nvereg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/vpo.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ral/rt2560.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ral/rt2661.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/channel.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/dsp.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/trm/trm.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/twa/tw_osl_freebsd.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb/if_aue.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb/if_auereg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_ethersubr.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_ethersubr.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/wds/wd7000.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/wi/if_wi.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/wi/if_wivar.h#2 integrate
.. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/procfs/procfs_status.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/unionfs/union.h#2 integrate
.. //depot/projects/vimage/src/sys/fs/unionfs/union_subr.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/unionfs/union_vfsops.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/unionfs/union_vnops.c#2 integrate
.. //depot/projects/vimage/src/sys/geom/journal/g_journal.c#2 integrate
.. //depot/projects/vimage/src/sys/i386/i386/machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/i386/isa/clock.c#2 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/isofs/cd9660/cd9660_node.h#2 integrate
.. //depot/projects/vimage/src/sys/kern/init_main.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/kern_clock.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/kern_fork.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/kern_idle.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/kern_intr.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/kern_kse.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/kern_poll.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/kern_proc.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/kern_resource.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/kern_subr.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/kern_switch.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/kern_thr.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/kern_umtx.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/ksched.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/subr_lock.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/subr_rman.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/subr_trap.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/tty.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_export.c#2 integrate
.. //depot/projects/vimage/src/sys/modules/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/isp/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/net/bridgestp.c#2 integrate
.. //depot/projects/vimage/src/sys/net/bridgestp.h#2 integrate
.. //depot/projects/vimage/src/sys/net/if_atmsubr.c#2 integrate
.. //depot/projects/vimage/src/sys/net/if_bridge.c#2 integrate
.. //depot/projects/vimage/src/sys/net/if_bridgevar.h#2 integrate
.. //depot/projects/vimage/src/sys/net/if_ethersubr.c#3 integrate
.. //depot/projects/vimage/src/sys/net/if_llc.h#2 integrate
.. //depot/projects/vimage/src/sys/net/if_ppp.c#2 integrate
.. //depot/projects/vimage/src/sys/net/if_pppvar.h#2 integrate
.. //depot/projects/vimage/src/sys/net/ppp_tty.c#2 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211.h#2 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_input.c#2 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#2 integrate
.. //depot/projects/vimage/src/sys/netinet/igmp.c#5 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_carp.h#2 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_output.c#4 integrate
.. //depot/projects/vimage/src/sys/netinet/libalias/alias.c#2 integrate
.. //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#2 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_diskless.c#2 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_socket.c#2 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfsdiskless.h#2 integrate
.. //depot/projects/vimage/src/sys/pc98/pc98/machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/pci/if_rl.c#2 integrate
.. //depot/projects/vimage/src/sys/pci/if_rlreg.h#2 integrate
.. //depot/projects/vimage/src/sys/pci/if_xl.c#2 integrate
.. //depot/projects/vimage/src/sys/pci/if_xlreg.h#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/pmap.h#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/intr_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/mmu_if.m#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/mmu_oea.c#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/uio_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/elf_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#2 integrate
.. //depot/projects/vimage/src/sys/sun4v/include/pcpu.h#2 integrate
.. //depot/projects/vimage/src/sys/sun4v/include/tsb.h#2 integrate
.. //depot/projects/vimage/src/sys/sun4v/mdesc/mdesc_init.c#2 integrate
.. //depot/projects/vimage/src/sys/sun4v/mdesc/mdesc_vdevfindval.c#2 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/mp_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/pmap.c#2 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/trap.c#2 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/tsb.c#2 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/uio_machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/vnex.c#2 integrate
.. //depot/projects/vimage/src/sys/sys/proc.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/rtprio.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/runq.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/sched.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/umtx.h#2 integrate
.. //depot/projects/vimage/src/sys/vm/vm_glue.c#2 integrate
.. //depot/projects/vimage/src/sys/vm/vm_page.c#2 integrate
.. //depot/projects/vimage/src/sys/vm/vm_zeroidle.c#2 integrate
Differences ...
==== //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.664 2006/11/19 20:54:57 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.666 2006/12/06 18:27:17 sobomax Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -514,6 +514,7 @@
* help lock contention somewhat, and this is critical for HTT. -Peter
*/
static int cpu_idle_hlt = 1;
+TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt);
SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW,
&cpu_idle_hlt, 0, "Idle loop HLT enable");
@@ -1121,11 +1122,7 @@
* This may be done better later if it gets more high level
* components in it. If so just link td->td_proc here.
*/
-#ifdef KSE
- proc_linkup(&proc0, &ksegrp0, &thread0);
-#else
proc_linkup(&proc0, &thread0);
-#endif
preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE);
preload_bootstrap_relocate(KERNBASE);
==== //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#2 (text) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.1 2006/04/21 04:24:50 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.2 2006/12/05 11:31:33 ru Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -215,7 +215,7 @@
j = ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1));
if ((pd[j] & (PG_PS | PG_V)) == (PG_PS | PG_V)) {
/* This is an entire 2M page. */
- pa = pd[j] & PG_FRAME & ~PDRMASK;
+ pa = pd[j] & PG_PS_FRAME;
for (k = 0; k < NPTEPG; k++) {
if (is_dumpable(pa))
dump_add_page(pa);
@@ -326,7 +326,7 @@
j = ((va >> PDRSHIFT) & ((1ul << NPDEPGSHIFT) - 1));
if ((pd[j] & (PG_PS | PG_V)) == (PG_PS | PG_V)) {
/* This is a single 2M block. Generate a fake PTP */
- pa = pd[j] & PG_FRAME & ~PDRMASK;
+ pa = pd[j] & PG_PS_FRAME;
for (k = 0; k < NPTEPG; k++) {
fakept[k] = (pa + (k * PAGE_SIZE)) | PG_V | PG_RW | PG_A | PG_M;
}
==== //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#2 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.576 2006/11/23 21:37:04 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.577 2006/12/05 11:31:33 ru Exp $");
/*
* Manages physical address maps.
@@ -947,9 +947,7 @@
pde = *pdep;
if (pde) {
if ((pde & PG_PS) != 0) {
- KASSERT((pde & PG_FRAME & PDRMASK) == 0,
- ("pmap_extract: bad pde"));
- rtval = (pde & PG_FRAME) | (va & PDRMASK);
+ rtval = (pde & PG_PS_FRAME) | (va & PDRMASK);
PMAP_UNLOCK(pmap);
return rtval;
}
@@ -982,9 +980,7 @@
if (pdep != NULL && (pde = *pdep)) {
if (pde & PG_PS) {
if ((pde & PG_RW) || (prot & VM_PROT_WRITE) == 0) {
- KASSERT((pde & PG_FRAME & PDRMASK) == 0,
- ("pmap_extract_and_hold: bad pde"));
- m = PHYS_TO_VM_PAGE((pde & PG_FRAME) |
+ m = PHYS_TO_VM_PAGE((pde & PG_PS_FRAME) |
(va & PDRMASK));
vm_page_hold(m);
}
@@ -1013,7 +1009,7 @@
} else {
pde = vtopde(va);
if (*pde & PG_PS) {
- pa = (*pde & ~(NBPDR - 1)) | (va & (NBPDR - 1));
+ pa = (*pde & PG_PS_FRAME) | (va & PDRMASK);
} else {
pa = *vtopte(va);
pa = (pa & PG_FRAME) | (va & PAGE_MASK);
==== //depot/projects/vimage/src/sys/amd64/conf/GENERIC#2 (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.469 2006/11/22 10:34:12 ru Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.470 2006/12/03 21:02:09 netchild Exp $
cpu HAMMER
ident GENERIC
@@ -71,11 +71,6 @@
# Make an SMP-capable kernel by default
options SMP # Symmetric MultiProcessor Kernel
-# Linux 32-bit ABI support
-options COMPAT_LINUX32 # Compatible with i386 linux binaries
-options LINPROCFS
-options LINSYSFS
-
# Bus support.
device acpi
device pci
==== //depot/projects/vimage/src/sys/amd64/include/pmap.h#2 (text+ko) ====
@@ -39,7 +39,7 @@
*
* from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90
* from: @(#)pmap.h 7.4 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.137 2006/11/19 20:54:57 alc Exp $
+ * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.138 2006/12/05 11:31:33 ru Exp $
*/
#ifndef _MACHINE_PMAP_H_
@@ -71,6 +71,7 @@
#define PG_W PG_AVAIL1 /* "Wired" pseudoflag */
#define PG_MANAGED PG_AVAIL2
#define PG_FRAME (0x000ffffffffff000ul)
+#define PG_PS_FRAME (0x000fffffffe00000ul)
#define PG_PROT (PG_RW|PG_U) /* all protection bits . */
#define PG_N (PG_NC_PWT|PG_NC_PCD) /* Non-cacheable */
==== //depot/projects/vimage/src/sys/amd64/isa/clock.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.227 2006/10/02 18:23:36 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.228 2006/12/03 03:49:28 bde Exp $");
/*
* Routines to handle clock hardware.
@@ -115,6 +115,7 @@
static int (*i8254_pending)(struct intsrc *);
static int i8254_ticked;
static int using_lapic_timer;
+static int rtc_reg = -1;
static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF;
static u_char rtc_statusb = RTCSB_24HR;
@@ -421,24 +422,30 @@
u_char val;
RTC_LOCK;
- outb(IO_RTC, reg);
- inb(0x84);
+ if (rtc_reg != reg) {
+ inb(0x84);
+ outb(IO_RTC, reg);
+ rtc_reg = reg;
+ inb(0x84);
+ }
val = inb(IO_RTC + 1);
- inb(0x84);
RTC_UNLOCK;
return (val);
}
-static __inline void
-writertc(u_char reg, u_char val)
+static void
+writertc(int reg, u_char val)
{
RTC_LOCK;
- inb(0x84);
- outb(IO_RTC, reg);
+ if (rtc_reg != reg) {
+ inb(0x84);
+ outb(IO_RTC, reg);
+ rtc_reg = reg;
+ inb(0x84);
+ }
+ outb(IO_RTC + 1, val);
inb(0x84);
- outb(IO_RTC + 1, val);
- inb(0x84); /* XXX work around wrong order in rtcin() */
RTC_UNLOCK;
}
==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.25 2006/10/31 17:53:02 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.26 2006/12/03 21:06:07 netchild Exp $");
#include "opt_compat.h"
#ifndef COMPAT_IA32
@@ -1120,7 +1120,7 @@
printf("Could not deinstall ELF interpreter entry\n");
break;
default:
- break;
+ return EOPNOTSUPP;
}
return error;
}
==== //depot/projects/vimage/src/sys/arm/arm/pmap.c#2 (text+ko) ====
@@ -147,7 +147,7 @@
#include "opt_vm.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.76 2006/12/01 12:29:55 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.77 2006/12/04 12:55:00 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -2807,6 +2807,7 @@
if (TAILQ_EMPTY(&m->md.pv_list))
vm_page_flag_clear(m, PG_WRITEABLE);
pmap_free_pv_entry(pv);
+ pmap_free_l2_bucket(pmap, l2b, 1);
}
vm_page_unlock_queues();
cpu_idcache_wbinv_all();
==== //depot/projects/vimage/src/sys/arm/at91/kb920x_machdep.c#2 (text) ====
@@ -48,7 +48,7 @@
#include "opt_at91.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.19 2006/11/11 20:57:52 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.20 2006/12/06 06:34:53 julian Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -455,11 +455,7 @@
undefined_handler_address = (u_int)undefinedinstruction_bounce;
undefined_init();
-#ifdef KSE
- proc_linkup(&proc0, &ksegrp0, &thread0);
-#else
proc_linkup(&proc0, &thread0);
-#endif
thread0.td_kstack = kernelstack.pv_va;
thread0.td_pcb = (struct pcb *)
(thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
==== //depot/projects/vimage/src/sys/arm/at91/uart_dev_at91usart.c#2 (text) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.9 2006/07/20 21:03:43 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.10 2006/12/07 00:24:15 cognet Exp $");
#include "opt_comconsole.h"
@@ -323,7 +323,10 @@
static int
at91_usart_bus_attach(struct uart_softc *sc)
{
- int err, i;
+#ifndef SKYEYE_WORKAROUNDS
+ int err;
+ int i;
+#endif
uint32_t cr;
struct at91_usart_softc *atsc;
@@ -345,6 +348,7 @@
sc->sc_rxfifosz = USART_BUFFER_SIZE;
sc->sc_hwiflow = 0;
+#ifndef SKYEYE_WORKAROUNDS
/*
* Allocate DMA tags and maps
*/
@@ -374,6 +378,7 @@
atsc->ping = &atsc->ping_pong[0];
atsc->pong = &atsc->ping_pong[1];
}
+#endif
/*
* Prime the pump with the RX buffer. We use two 64 byte bounce
@@ -407,9 +412,13 @@
WR4(&sc->sc_bas, USART_IER, USART_CSR_RXRDY);
}
WR4(&sc->sc_bas, USART_IER, USART_CSR_RXBRK);
+#ifndef SKYEYE_WORKAROUNDS
errout:;
// XXX bad
return (err);
+#else
+ return (0);
+#endif
}
static int
==== //depot/projects/vimage/src/sys/arm/sa11x0/assabet_machdep.c#2 (text+ko) ====
@@ -47,7 +47,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.20 2006/11/11 20:57:52 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.21 2006/12/06 06:34:54 julian Exp $");
#include "opt_md.h"
@@ -422,11 +422,7 @@
/* Set stack for exception handlers */
-#ifdef KSE
- proc_linkup(&proc0, &ksegrp0, &thread0);
-#else
proc_linkup(&proc0, &thread0);
-#endif
thread0.td_kstack = kernelstack.pv_va;
thread0.td_pcb = (struct pcb *)
(thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
==== //depot/projects/vimage/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 (text+ko) ====
@@ -49,7 +49,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.4 2006/11/17 00:53:39 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/ep80219_machdep.c,v 1.5 2006/12/06 06:34:54 julian Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -429,11 +429,7 @@
undefined_handler_address = (u_int)undefinedinstruction_bounce;
undefined_init();
-#ifdef KSE
- proc_linkup(&proc0, &ksegrp0, &thread0);
-#else
proc_linkup(&proc0, &thread0);
-#endif
thread0.td_kstack = kernelstack.pv_va;
thread0.td_pcb = (struct pcb *)
(thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
==== //depot/projects/vimage/src/sys/arm/xscale/i80321/i80321_space.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_space.c,v 1.6 2006/11/20 13:21:02 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_space.c,v 1.7 2006/12/02 13:37:29 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -139,6 +139,42 @@
generic_armv4_bs_c_2,
NULL,
NULL,
+
+ /* read (single) stream */
+ generic_bs_r_1,
+ generic_armv4_bs_r_2,
+ generic_bs_r_4,
+ NULL,
+
+ /* read multiple stream */
+ generic_bs_rm_1,
+ generic_armv4_bs_rm_2,
+ generic_bs_rm_4,
+ NULL,
+
+ /* read region stream */
+ generic_bs_rr_1,
+ generic_armv4_bs_rr_2,
+ generic_bs_rr_4,
+ NULL,
+
+ /* write (single) stream */
+ generic_bs_w_1,
+ generic_armv4_bs_w_2,
+ generic_bs_w_4,
+ NULL,
+
+ /* write multiple stream */
+ generic_bs_wm_1,
+ generic_armv4_bs_wm_2,
+ generic_bs_wm_4,
+ NULL,
+
+ /* write region stream */
+ NULL,
+ generic_armv4_bs_wr_2,
+ generic_bs_wr_4,
+ NULL,
};
void
==== //depot/projects/vimage/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 (text+ko) ====
@@ -49,7 +49,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.25 2006/11/17 00:53:39 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.26 2006/12/06 06:34:54 julian Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -427,11 +427,7 @@
undefined_handler_address = (u_int)undefinedinstruction_bounce;
undefined_init();
-#ifdef KSE
- proc_linkup(&proc0, &ksegrp0, &thread0);
-#else
proc_linkup(&proc0, &thread0);
-#endif
thread0.td_kstack = kernelstack.pv_va;
thread0.td_pcb = (struct pcb *)
(thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
==== //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_machdep.c#2 (text+ko) ====
@@ -49,7 +49,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.2 2006/12/06 06:34:54 julian Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -493,11 +493,7 @@
undefined_handler_address = (u_int)undefinedinstruction_bounce;
undefined_init();
-#ifdef KSE
- proc_linkup(&proc0, &ksegrp0, &thread0);
-#else
proc_linkup(&proc0, &thread0);
-#endif
thread0.td_kstack = kernelstack.pv_va;
thread0.td_pcb = (struct pcb *)
(thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
==== //depot/projects/vimage/src/sys/arm/xscale/ixp425/files.ixp425#2 (text+ko) ====
@@ -1,4 +1,4 @@
-#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.1 2006/11/19 23:55:23 sam Exp $
+#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.2 2006/12/07 00:49:33 sam Exp $
arm/arm/cpufunc_asm_xscale.S standard
arm/arm/irq_dispatch.S standard
arm/xscale/ixp425/ixp425.c standard
@@ -18,7 +18,11 @@
#
# NPE-based Ethernet support (requires qmgr also). Note the
# firmware images must be downloaded from the Intel web site.
+# The URL seems to change frequently; try this as a starting
+# place:
#
+# http://www.intel.com/design/network/products/npfamily/download_ixp400.htm
+#
arm/xscale/ixp425/if_npe.c optional npe
arm/xscale/ixp425/ixp425_npe.c optional npe
ixp425_npe_fw.c optional npe_fw \
@@ -31,10 +35,15 @@
# get known values for reference in the _fw.c file.
#
IxNpeMicrocode.fwo optional npe_fw \
- dependency "$S/arm/xscale/ixp425/IxNpeMicrocode.dat" \
- compile-with "ln -sf $S/arm/xscale/ixp425/IxNpeMicrocode.dat ${.OBJDIR}; ${LD} -b binary -d -warn-common -r -d -o ${.TARGET} IxNpeMicrocode.dat" \
+ dependency "IxNpeMicrocode.dat" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} IxNpeMicrocode.dat" \
no-implicit-rule \
- clean "IxNpeMicrocode.dat IxNpeMicrocode.fwo"
+ clean "IxNpeMicrocode.fwo"
+IxNpeMicrocode.dat optional npe_fw \
+ dependency ".PHONY" \
+ compile-with "if [ -e $S/arm/xscale/ixp425/IxNpeMicrocode.dat ]; then ln -sf $S/arm/xscale/ixp425/IxNpeMicrocode.dat .; else echo 'WARNING, no IxNpeMicrocode.dat file; you must obtain this from the Intel web site'; false; fi" \
+ no-obj no-implicit-rule \
+ clean "IxNpeMicrocode.dat"
#
# Q-Manager support
#
==== //depot/projects/vimage/src/sys/boot/i386/btx/btx/btx.S#2 (text+ko) ====
@@ -12,7 +12,7 @@
* warranties of merchantability and fitness for a particular
* purpose.
*
- * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.43 2006/10/05 15:30:51 jhb Exp $
+ * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.44 2006/12/06 17:45:35 jhb Exp $
*/
/*
@@ -499,6 +499,8 @@
je v86cli # Yes
cmpb $0xfb,%al # STI?
je v86sti # Yes
+ cmpb $0xcc,%al # INT3?
+ je v86mon.7 # Yes, ignore
movzwl 0x38(%ebp),%ebx # Load V86 SS
shll $0x4,%ebx # To offset
pushl %ebx # Save
==== //depot/projects/vimage/src/sys/cam/cam_ccb.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/cam/cam_ccb.h,v 1.33 2006/11/02 00:54:32 mjacob Exp $
+ * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.34 2006/12/03 07:19:28 mjacob Exp $
*/
#ifndef _CAM_CAM_CCB_H
@@ -719,7 +719,6 @@
#define CTS_SPI_VALID_PPR_OPTIONS 0x10
u_int flags;
#define CTS_SPI_FLAGS_DISC_ENB 0x01
-#define CTS_SPI_FLAGS_TAG_ENB 0x02
u_int sync_period;
u_int sync_offset;
u_int bus_width;
==== //depot/projects/vimage/src/sys/cam/cam_periph.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.63 2006/10/01 20:23:50 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.64 2006/12/05 07:45:27 mjacob Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -334,12 +334,12 @@
if (periph != NULL && periph->unit_number == newunit) {
if (wired != 0) {
- xpt_print_path(periph->path);
- printf("Duplicate Wired Device entry!\n");
- xpt_print_path(periph->path);
- printf("Second device (%s device at scbus%d "
- "target %d lun %d) will not be wired\n",
- periph_name, pathid, target, lun);
+ xpt_print(periph->path, "Duplicate Wired "
+ "Device entry!\n");
+ xpt_print(periph->path, "Second device (%s "
+ "device at scbus%d target %d lun %d) will "
+ "not be wired\n", periph_name, pathid,
+ target, lun);
wired = 0;
}
continue;
@@ -995,8 +995,8 @@
saved_ccb->ccb_h.status |=
CAM_AUTOSNS_VALID;
#if 0
- xpt_print_path(saved_ccb->ccb_h.path);
- printf("Recovered Sense\n");
+ xpt_print(saved_ccb->ccb_h.path,
+ "Recovered Sense\n");
scsi_sense_print(&saved_ccb->csio);
cam_error_print(saved_ccb, CAM_ESF_ALL,
CAM_EPF_ALL);
@@ -1287,8 +1287,7 @@
*timeout = 0;
error = ERESTART;
if (bootverbose) {
- xpt_print_path(ccb->ccb_h.path);
- printf("Queue Full\n");
+ xpt_print(ccb->ccb_h.path, "Queue Full\n");
}
break;
}
@@ -1300,8 +1299,7 @@
* command completes or a 1 second timeout.
*/
if (bootverbose) {
- xpt_print_path(ccb->ccb_h.path);
- printf("Device Busy\n");
+ xpt_print(ccb->ccb_h.path, "Device Busy\n");
}
if (ccb->ccb_h.retry_count > 0) {
ccb->ccb_h.retry_count--;
@@ -1314,13 +1312,12 @@
}
break;
case SCSI_STATUS_RESERV_CONFLICT:
- xpt_print_path(ccb->ccb_h.path);
- printf("Reservation Conflict\n");
+ xpt_print(ccb->ccb_h.path, "Reservation Conflict\n");
error = EIO;
break;
default:
- xpt_print_path(ccb->ccb_h.path);
- printf("SCSI Status 0x%x\n", ccb->csio.scsi_status);
+ xpt_print(ccb->ccb_h.path, "SCSI Status 0x%x\n",
+ ccb->csio.scsi_status);
error = EIO;
break;
}
@@ -1574,42 +1571,38 @@
&timeout);
break;
case CAM_AUTOSENSE_FAIL:
- xpt_print_path(ccb->ccb_h.path);
- printf("AutoSense Failed\n");
+ xpt_print(ccb->ccb_h.path, "AutoSense Failed\n");
error = EIO; /* we have to kill the command */
break;
case CAM_REQ_CMP_ERR:
if (bootverbose && printed == 0) {
- xpt_print_path(ccb->ccb_h.path);
- printf("Request completed with CAM_REQ_CMP_ERR\n");
+ xpt_print(ccb->ccb_h.path,
+ "Request completed with CAM_REQ_CMP_ERR\n");
printed++;
}
/* FALLTHROUGH */
case CAM_CMD_TIMEOUT:
if (bootverbose && printed == 0) {
- xpt_print_path(ccb->ccb_h.path);
- printf("Command timed out\n");
+ xpt_print(ccb->ccb_h.path, "Command timed out\n");
printed++;
}
/* FALLTHROUGH */
case CAM_UNEXP_BUSFREE:
if (bootverbose && printed == 0) {
- xpt_print_path(ccb->ccb_h.path);
- printf("Unexpected Bus Free\n");
+ xpt_print(ccb->ccb_h.path, "Unexpected Bus Free\n");
printed++;
}
/* FALLTHROUGH */
case CAM_UNCOR_PARITY:
if (bootverbose && printed == 0) {
- xpt_print_path(ccb->ccb_h.path);
- printf("Uncorrected Parity Error\n");
+ xpt_print(ccb->ccb_h.path,
+ "Uncorrected Parity Error\n");
printed++;
}
/* FALLTHROUGH */
case CAM_DATA_RUN_ERR:
if (bootverbose && printed == 0) {
- xpt_print_path(ccb->ccb_h.path);
- printf("Data Overrun\n");
+ xpt_print(ccb->ccb_h.path, "Data Overrun\n");
printed++;
}
error = EIO; /* we have to kill the command */
@@ -1638,8 +1631,8 @@
ccb->ccb_h.retry_count--;
error = ERESTART;
if (bootverbose && printed == 0) {
- xpt_print_path(ccb->ccb_h.path);
- printf("Selection Timeout\n");
+ xpt_print(ccb->ccb_h.path,
+ "Selection Timeout\n");
printed++;
}
@@ -1701,8 +1694,7 @@
/* Unconditional requeue */
error = ERESTART;
if (bootverbose && printed == 0) {
- xpt_print_path(ccb->ccb_h.path);
- printf("Request Requeued\n");
+ xpt_print(ccb->ccb_h.path, "Request Requeued\n");
printed++;
}
break;
@@ -1723,8 +1715,8 @@
ccb->ccb_h.retry_count--;
error = ERESTART;
if (bootverbose && printed == 0) {
- xpt_print_path(ccb->ccb_h.path);
- printf("CAM Status 0x%x\n", status);
+ xpt_print(ccb->ccb_h.path, "CAM Status 0x%x\n",
+ status);
printed++;
}
} else {
@@ -1763,11 +1755,9 @@
if (action_string == NULL)
action_string = "Unretryable Error";
if (error != ERESTART) {
- xpt_print_path(ccb->ccb_h.path);
- printf("error %d\n", error);
+ xpt_print(ccb->ccb_h.path, "error %d\n", error);
}
- xpt_print_path(ccb->ccb_h.path);
- printf("%s\n", action_string);
+ xpt_print(ccb->ccb_h.path, "%s\n", action_string);
}
return (error);
==== //depot/projects/vimage/src/sys/cam/cam_xpt.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.168 2006/11/07 23:06:00 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.171 2006/12/10 05:37:48 mjacob Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -63,6 +63,7 @@
#include <cam/scsi/scsi_all.h>
#include <cam/scsi/scsi_message.h>
#include <cam/scsi/scsi_pass.h>
+#include <machine/stdarg.h> /* for xpt_print below */
#include "opt_cam.h"
/* Datastructures internal to the xpt layer */
@@ -150,6 +151,8 @@
#define CAM_DEV_RESIZE_QUEUE_NEEDED 0x10
#define CAM_DEV_TAG_AFTER_COUNT 0x20
#define CAM_DEV_INQUIRY_DATA_VALID 0x40
+#define CAM_DEV_IN_DV 0x80
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list