Date: Sat, 22 Jul 2006 09:24:37 GMT From: Roman Divacky <rdivacky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 102125 for review Message-ID: <200607220924.k6M9ObUv019564@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=102125 Change 102125 by rdivacky@rdivacky_witten on 2006/07/22 09:24:12 IFC Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/pmap.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/include/specialreg.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#8 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#8 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#8 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#8 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/db_trace.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/in_cksum.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/pmap.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_pio.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_pmc.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_spi.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_spiio.h#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_st.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_twi.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/files.at91#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/if_ate.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/std.at91#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/std.kb920x#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/conf/KB920X#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/include/gdb_machdep.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_file.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#4 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_socket.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_proto.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_syscall.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_syscallnames.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_sysent.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/syscalls.master#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/Makefile.arm#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/NOTES#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files.arm#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files.ia64#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/kern.pre.mk#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/options#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/options.arm#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/crypto/via/padlock.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ddb/db_command.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ddb/db_output.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ddb/db_output.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ddb/db_ps.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ddb/db_thread.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ddb/ddb.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/aac/aac_cam.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/amr/amr.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ata/ata-queue.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/bce/if_bce.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/em/if_em.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/em/if_em.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/fdc/fdc.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/iicbus/iic.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/iicbus/iic.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/isp.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/isp_library.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/isp_pci.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/isp_target.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mpt/mpt.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mpt/mpt.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mpt/mpt_cam.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mpt/mpt_raid.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/pccard/pccarddevs#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/pci/pci.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/random/probe.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sio/sio.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sk/if_sk.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sk/if_skreg.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sound/driver.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sound/pci/emu10kx-midi.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sound/pci/emu10kx-pcm.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sound/pci/emu10kx.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sound/pci/emu10kx.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/spibus/spi.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/spibus/spibus.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/spibus/spibus_if.m#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/spibus/spibusvar.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/stg/tmc18c30_subr.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/streams/streams.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/fs/devfs/devfs_vfsops.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/fs/portalfs/portal_vnops.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/geom/geom.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/geom/raid3/g_raid3_ctl.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/gnu/dev/sound/pci/emu10k1-ac97.h#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/gnu/dev/sound/pci/emu10k1.h#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/gnu/dev/sound/pci/p16v-alsa.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/gnu/dev/sound/pci/p17v-alsa.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/db_trace.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/identcpu.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/initcpu.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/local_apic.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/machdep.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/pmap.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_proto.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_syscall.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_sysent.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/syscalls.master#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/include/md_var.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/include/specialreg.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#20 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#13 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#13 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#13 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#13 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/init_sysent.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_descrip.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_intr.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_ktr.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_lock.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_mac.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_thr.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_uuid.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/link_elf.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/subr_autoconf.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/subr_prf.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/subr_turnstile.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/syscalls.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/syscalls.master#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/sysv_sem.c#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_domain.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_socket.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_socket2.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_syscalls.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_usrreq.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/vfs_bio.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/vfs_subr.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/vfs_syscalls.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/sound/driver/Makefile#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/sound/driver/emu10kx/Makefile#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_spppsubr.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_tap.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/raw_usrreq.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/rtsock.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net80211/ieee80211_input.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netatm/atm_aal5.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netatm/atm_usrreq.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netgraph/bluetooth/include/ng_btsocket_l2cap.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netgraph/ng_socket.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/in_pcb.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/in_pcb.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/ip_divert.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/raw_ip.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/tcp_subr.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/udp_usrreq.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet6/README#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/netinet6/in6_pcb.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet6/raw_ip6.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netipsec/keysock.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netipx/spx_usrreq.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netkey/keysock.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netnatm/natm.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netsmb/smb_conn.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/pc98/pc98/machdep.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/posix4/ksched.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/posix4/p1003_1b.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/security/mac/mac_vfs.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sparc64/include/pmap.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/libkern.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/mbuf.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/param.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/protosw.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/syscall.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/syscall.mk#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/sysctl.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/sysproto.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/thr.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/pmap.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/uma_core.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/vm.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/vm_fault.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/vm_map.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/vm_meter.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/vm_object.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/vm_object.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/vm_page.c#4 integrate Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/db_trace.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.74 2006/03/13 23:56:44 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.75 2006/07/12 21:22:42 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -390,16 +390,14 @@ long *argp; db_expr_t offset; c_db_sym_t sym; - int narg, quit; + int narg; boolean_t first; if (count == -1) count = 1024; first = TRUE; - quit = 0; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - while (count-- && !quit) { + while (count-- && !db_pager_quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &offset); db_symbol_values(sym, &name, NULL); ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/identcpu.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.146 2006/04/24 22:56:57 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.147 2006/07/12 06:04:11 jkim Exp $"); #include "opt_cpu.h" @@ -306,8 +306,8 @@ "\020" "\001LAHF" /* LAHF/SAHF in long mode */ "\002CMP" /* CMP legacy */ - "\003<b2>" - "\004<b3>" + "\003SVM" /* Secure Virtual Mode */ + "\004ExtAPIC" /* Extended APIC register */ "\005CR8" /* CR8 in legacy mode */ "\006<b5>" "\007<b6>" ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/intr_machdep.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.19 2006/02/28 22:24:54 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.20 2006/07/12 21:22:42 jhb Exp $ */ /* @@ -338,16 +338,14 @@ DB_SHOW_COMMAND(irqs, db_show_irqs) { struct intsrc **isrc; - int i, quit, verbose; + int i, verbose; - quit = 0; if (strcmp(modif, "v") == 0) verbose = 1; else verbose = 0; isrc = interrupt_sources; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - for (i = 0; i < NUM_IO_INTS && !quit; i++, isrc++) + for (i = 0; i < NUM_IO_INTS && !db_pager_quit; i++, isrc++) if (*isrc != NULL) db_dump_intr_event((*isrc)->is_event, verbose); } ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.25 2006/03/20 19:39:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.26 2006/07/12 21:22:42 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -755,18 +755,16 @@ DB_SHOW_COMMAND(apic, db_show_apic) { struct intsrc *isrc; - int quit, i, verbose; + int i, verbose; u_int irq; - quit = 0; if (strcmp(modif, "vv") == 0) verbose = 2; else if (strcmp(modif, "v") == 0) verbose = 1; else verbose = 0; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - for (i = 0; i < APIC_NUM_IOINTS + 1 && !quit; i++) { + for (i = 0; i < APIC_NUM_IOINTS + 1 && !db_pager_quit; i++) { irq = ioint_irqs[i]; if (irq != 0 && irq != IRQ_SYSCALL) { db_printf("vec 0x%2x -> ", i + APIC_IO_INTS); ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/pmap.c#5 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.565 2006/07/06 06:17:08 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.567 2006/07/20 17:48:40 alc Exp $"); /* * Manages physical address maps. @@ -207,7 +207,6 @@ static void free_pv_entry(pmap_t pmap, pv_entry_t pv); static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try); -static void pmap_clear_write(vm_page_t m); static vm_page_t pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_page_t mpte); @@ -1627,6 +1626,7 @@ int idx, field, bit; mtx_assert(&vm_page_queue_mtx, MA_OWNED); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); PV_STAT(pv_entry_frees++); PV_STAT(pv_entry_spare++); pv_entry_count--; @@ -2015,8 +2015,8 @@ TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); m->md.pv_list_count--; pmap_unuse_pt(pmap, pv->pv_va, ptepde); + free_pv_entry(pmap, pv); PMAP_UNLOCK(pmap); - free_pv_entry(pmap, pv); } vm_page_flag_clear(m, PG_WRITEABLE); } @@ -2971,7 +2971,7 @@ /* * Clear the write and modified bits in each of the given page's mappings. */ -static __inline void +void pmap_clear_write(vm_page_t m) { pv_entry_t pv; ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/include/specialreg.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.33 2006/05/01 22:07:00 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.35 2006/07/13 16:09:40 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -109,16 +109,18 @@ #define CPUID_SS 0x08000000 #define CPUID_HTT 0x10000000 #define CPUID_TM 0x20000000 -#define CPUID_B30 0x40000000 +#define CPUID_IA64 0x40000000 #define CPUID_PBE 0x80000000 #define CPUID2_SSE3 0x00000001 #define CPUID2_MON 0x00000008 #define CPUID2_DS_CPL 0x00000010 +#define CPUID2_VMX 0x00000020 #define CPUID2_EST 0x00000080 #define CPUID2_TM2 0x00000100 #define CPUID2_CNTXID 0x00000400 #define CPUID2_CX16 0x00002000 +#define CPUID2_XTPR 0x00004000 /* * Important bits in the AMD extended cpuid flags @@ -135,6 +137,8 @@ #define AMDID2_LAHF 0x00000001 #define AMDID2_CMP 0x00000002 +#define AMDID2_SVM 0x00000004 +#define AMDID2_EXT_APIC 0x00000008 #define AMDID2_CR8 0x00000010 /* @@ -188,6 +192,7 @@ #define MSR_THERM_CONTROL 0x19a #define MSR_THERM_INTERRUPT 0x19b #define MSR_THERM_STATUS 0x19c +#define MSR_IA32_MISC_ENABLE 0x1a0 #define MSR_DEBUGCTLMSR 0x1d9 #define MSR_LASTBRANCHFROMIP 0x1db #define MSR_LASTBRANCHTOIP 0x1dc @@ -356,7 +361,7 @@ #define AMD_WT_ALLOC_PRE 0x20000 /* programmable range enable */ #define AMD_WT_ALLOC_FRE 0x10000 /* fixed (A0000-FFFFF) range enable */ -/* X86-64 MSR's */ +/* AMD64 MSR's */ #define MSR_EFER 0xc0000080 /* extended features */ #define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target/cs/ss */ #define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target rip */ ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.17 2006/07/06 21:43:14 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.15 2006/07/06 21:42:35 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.18 2006/07/11 20:55:22 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.17 2006/07/06 21:43:14 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.15 2006/07/06 21:42:35 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.18 2006/07/11 20:55:22 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.17 2006/07/06 21:43:14 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.15 2006/07/06 21:42:35 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.18 2006/07/11 20:55:22 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp */ #include <bsm/audit_kevents.h> @@ -109,7 +109,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = linux_uselib */ { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */ + { SYF_MPSAFE | AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */ { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 90 = linux_mmap */ { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 91 = munmap */ { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 92 = linux_truncate */ @@ -161,7 +161,7 @@ { SYF_MPSAFE | AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID }, /* 138 = linux_setfsuid16 */ { SYF_MPSAFE | AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID }, /* 139 = linux_setfsgid16 */ { SYF_MPSAFE | AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */ + { SYF_MPSAFE | AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */ { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 142 = linux_select */ { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 143 = flock */ { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 144 = linux_msync */ @@ -240,7 +240,7 @@ { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 217 = linux_pivot_root */ { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 218 = linux_mincore */ { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */ + { SYF_MPSAFE | AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */ { SYF_MPSAFE | AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL }, /* 221 = linux_fcntl64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 222 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 223 = */ ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#8 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.15 2006/07/06 21:42:35 jhb Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -169,7 +169,7 @@ 87 AUE_SWAPON MNOPROTO { int swapon(char *name); } 88 AUE_REBOOT MSTD { int linux_reboot(l_int magic1, \ l_int magic2, l_uint cmd, void *arg); } -89 AUE_O_GETDENTS STD { int linux_readdir(l_uint fd, \ +89 AUE_O_GETDENTS MSTD { int linux_readdir(l_uint fd, \ struct l_dirent *dent, l_uint count); } 90 AUE_MMAP MSTD { int linux_mmap(struct l_mmap_argv *ptr); } 91 AUE_MUNMAP MNOPROTO { int munmap(caddr_t addr, int len); } @@ -246,7 +246,7 @@ 140 AUE_LSEEK MSTD { int linux_llseek(l_int fd, l_ulong ohigh, \ l_ulong olow, l_loff_t *res, \ l_uint whence); } -141 AUE_O_GETDENTS STD { int linux_getdents(l_uint fd, void *dent, \ +141 AUE_O_GETDENTS MSTD { int linux_getdents(l_uint fd, void *dent, \ l_uint count); } 142 AUE_SELECT MSTD { int linux_select(l_int nfds, \ l_fd_set *readfds, l_fd_set *writefds, \ @@ -381,7 +381,7 @@ l_size_t len, u_char *vec); } 219 AUE_MADVISE MNOPROTO { int madvise(void *addr, size_t len, \ int behav); } -220 AUE_O_GETDENTS STD { int linux_getdents64(l_uint fd, \ +220 AUE_O_GETDENTS MSTD { int linux_getdents64(l_uint fd, \ void *dirent, l_uint count); } 221 AUE_FCNTL MSTD { int linux_fcntl64(l_uint fd, l_uint cmd, \ uintptr_t arg); } ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/db_trace.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.12 2005/09/10 03:01:24 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.13 2006/07/12 21:22:42 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -93,15 +93,13 @@ db_expr_t value; db_expr_t offset; boolean_t kernel_only = TRUE; - int scp_offset, quit; + int scp_offset; frame = (u_int32_t *)addr; lastframe = NULL; scp_offset = -(get_pc_str_offset() >> 2); - quit = 0; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - while (count-- && frame != NULL && !quit) { + while (count-- && frame != NULL && !db_pager_quit) { db_addr_t scp; u_int32_t savecode; int r; ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/in_cksum.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__FBSDID("$FreeBSD: src/sys/arm/arm/in_cksum.c,v 1.6 2006/03/09 23:33:59 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/in_cksum.c,v 1.7 2006/07/18 00:07:05 cognet Exp $"); #include <sys/param.h> #include <sys/mbuf.h> @@ -89,6 +89,17 @@ return (sum); } +static +uint64_t _do_cksum(void *addr, int len) +{ + uint64_t sum; + union q_util q_util; + + sum = do_cksum(addr, len); + REDUCE32; + return (sum); +} + u_short in_cksum_skip(struct mbuf *m, int len, int skip) { @@ -120,9 +131,9 @@ mlen = len; if ((clen ^ (int) addr) & 1) - sum += do_cksum(addr, mlen) << 8; + sum += _do_cksum(addr, mlen) << 8; else - sum += do_cksum(addr, mlen); + sum += _do_cksum(addr, mlen); clen += mlen; len -= mlen; ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/pmap.c#4 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.65 2006/07/11 11:22:06 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.66 2006/07/20 23:26:22 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -4461,6 +4461,21 @@ /* + * Clear the write and modified bits in each of the given page's mappings. + */ +void +pmap_clear_write(vm_page_t m) +{ + + if (m->md.pvh_attrs & PVF_WRITE) + pmap_clearbit(m, PVF_WRITE); + else + KASSERT((m->flags & PG_WRITEABLE) == 0, + ("pmap_clear_write: page %p has PG_WRITEABLE set", m)); +} + + +/* * perform the pmap work for mincore */ int ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/vm_machdep.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.24 2006/06/05 23:42:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.26 2006/07/15 23:15:31 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -512,7 +512,7 @@ void *ret; struct arm_small_page *sp, *tmp; TAILQ_HEAD(,arm_small_page) *head; - static int in_alloc; + static struct thread *in_alloc; static int in_sleep; int should_wakeup = 0; @@ -532,12 +532,13 @@ if (!sp) { /* No more free pages, need to alloc more. */ - if (!(wait & M_WAITOK)) { + if (!(wait & M_WAITOK) || + in_alloc == curthread) { mtx_unlock(&smallalloc_mtx); *flags = UMA_SLAB_KMEM; return ((void *)kmem_malloc(kmem_map, bytes, M_NOWAIT)); } - if (in_alloc) { + if (in_alloc != NULL) { /* Somebody else is already doing the allocation. */ in_sleep++; msleep(&in_alloc, &smallalloc_mtx, PWAIT, @@ -545,14 +546,14 @@ in_sleep--; goto retry; } - in_alloc = 1; + in_alloc = curthread; mtx_unlock(&smallalloc_mtx); /* Try to alloc 1MB of contiguous memory. */ ret = arm_uma_do_alloc(&sp, bytes, zone == l2zone ? SECTION_PT : SECTION_CACHE); mtx_lock(&smallalloc_mtx); - in_alloc = 0; - if (in_sleep) + in_alloc = NULL; + if (in_sleep > 0) should_wakeup = 1; if (sp) { for (int i = 0; i < (0x100000 / PAGE_SIZE) - 1; ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_pio.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.2 2006/07/02 03:50:44 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.3 2006/07/14 22:22:57 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -280,21 +280,29 @@ * them. */ void -at91_pio_use_periph_a(uint32_t pio, uint32_t periph_a_mask) +at91_pio_use_periph_a(uint32_t pio, uint32_t periph_a_mask, int use_pullup) { uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); PIO[PIO_ASR / 4] = periph_a_mask; PIO[PIO_PDR / 4] = periph_a_mask; + if (use_pullup) + PIO[PIO_PUER / 4] = periph_a_mask; + else + PIO[PIO_PUDR / 4] = periph_a_mask; } void -at91_pio_use_periph_b(uint32_t pio, uint32_t periph_b_mask) +at91_pio_use_periph_b(uint32_t pio, uint32_t periph_b_mask, int use_pullup) { uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); PIO[PIO_BSR / 4] = periph_b_mask; PIO[PIO_PDR / 4] = periph_b_mask; + if (use_pullup) + PIO[PIO_PUER / 4] = periph_b_mask; + else + PIO[PIO_PUDR / 4] = periph_b_mask; } void @@ -314,11 +322,15 @@ } void -at91_pio_gpio_output(uint32_t pio, uint32_t output_enable_mask) +at91_pio_gpio_output(uint32_t pio, uint32_t output_enable_mask, int use_pullup) { uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); PIO[PIO_OER / 4] = output_enable_mask; + if (use_pullup) + PIO[PIO_PUER / 4] = output_enable_mask; + else + PIO[PIO_PUDR / 4] = output_enable_mask; } void ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_piovar.h#2 (text+ko) ==== @@ -22,16 +22,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_piovar.h,v 1.1 2006/07/02 03:50:44 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_piovar.h,v 1.2 2006/07/14 22:22:57 imp Exp $ */ #ifndef ARM_AT91_AT91_PIOVAR_H #define ARM_AT91_AT91_PIOVAR_H -void at91_pio_use_periph_a(uint32_t pio, uint32_t periph_a_mask); -void at91_pio_use_periph_b(uint32_t pio, uint32_t periph_b_mask); +void at91_pio_use_periph_a(uint32_t pio, uint32_t periph_a_mask, int use_pullup); +void at91_pio_use_periph_b(uint32_t pio, uint32_t periph_b_mask, int use_pullup); void at91_pio_use_gpio(uint32_t pio, uint32_t gpio_mask); void at91_pio_gpio_input(uint32_t pio, uint32_t input_enable_mask); -void at91_pio_gpio_output(uint32_t pio, uint32_t output_enable_mask); +void at91_pio_gpio_output(uint32_t pio, uint32_t output_enable_mask, + int use_pullup); void at91_pio_gpio_set(uint32_t pio, uint32_t data_mask); void at91_pio_gpio_clear(uint32_t pio, uint32_t data_mask); ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_pmc.c#3 (text) ==== @@ -22,8 +22,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_at91.h" + #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.2 2006/06/17 23:22:10 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.3 2006/07/14 22:01:51 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -397,7 +399,11 @@ pmc_softc->dev = dev; if ((err = at91_pmc_activate(dev)) != 0) return err; +#ifdef AT91_TSC + at91_pmc_init_clock(pmc_softc, 16000000); +#else at91_pmc_init_clock(pmc_softc, 10000000); +#endif return (0); } ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_rtc.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.1 2006/03/24 07:35:30 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.2 2006/07/14 21:37:19 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -223,9 +223,14 @@ static int at91_rtc_settime(device_t dev, struct timespec *ts) { - // XXX UGLY XXX - printf("SET TIME\n"); - return (EINVAL); + struct at91_rtc_softc *sc; + struct clocktime ct; + + sc = device_get_softc(dev); + clock_ts_to_ct(ts, &ct); + WR4(sc, RTC_TIMR, RTC_TIMR_MK(ct.hour, ct.min, ct.sec)); + WR4(sc, RTC_CALR, RTC_CALR_MK(ct.year, ct.mon, ct.day, ct.dow)); + return (0); } static device_method_t at91_rtc_methods[] = { ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_rtcreg.h#2 (text) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_rtcreg.h,v 1.1 2006/03/24 07:35:30 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_rtcreg.h,v 1.2 2006/07/14 22:06:01 imp Exp $ */ #ifndef ARM_AT91_AT91_RTCREG_H #define ARM_AT91_AT91_RTCREG_H @@ -74,7 +74,7 @@ #define RTC_CALR_DAY_S 24 #define RTC_CALR_DAY(x) FROMBCD(((x) & RTC_CALR_DAY_M) >> RTC_CALR_DAY_S) #define RTC_CALR_MK(yr, mon, day, dow) \ - ((TOBCD((yr) / 100 + 19) << RTC_CALR_CENTURY_S) | \ + ((TOBCD((yr) / 100 + 19) << RTC_CALR_CEN_S) | \ (TOBCD((yr) % 100) << RTC_CALR_YEAR_S) | \ (TOBCD(mon) << RTC_CALR_MON_S) | \ (TOBCD(dow) << RTC_CALR_DOW_S) | \ ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/at91_spi.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.1 2006/02/04 23:32:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.2 2006/07/14 21:35:59 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -39,7 +39,10 @@ #include <machine/bus.h> #include <arm/at91/at91_spireg.h> -#include <arm/at91/at91_spiio.h> +#include <arm/at91/at91_pdcreg.h> + +#include <dev/spibus/spi.h> +#include "spibus_if.h" struct at91_spi_softc { @@ -48,13 +51,8 @@ struct resource *irq_res; /* IRQ resource */ struct resource *mem_res; /* Memory resource */ struct mtx sc_mtx; /* basically a perimeter lock */ - int flags; -#define XFER_PENDING 1 /* true when transfer taking place */ -#define OPENED 2 /* Device opened */ -#define RXRDY 4 -#define TXCOMP 8 -#define TXRDY 0x10 - struct cdev *cdev; + bus_dma_tag_t dmatag; /* bus dma tag for mbufs */ + bus_dmamap_t map[4]; /* Maps for the transaction */ }; static inline uint32_t @@ -77,7 +75,6 @@ #define AT91_SPI_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); #define AT91_SPI_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); #define AT91_SPI_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); -#define CDEV2SOFTC(dev) ((dev)->si_drv1) static devclass_t at91_spi_devclass; @@ -86,25 +83,11 @@ static int at91_spi_probe(device_t dev); static int at91_spi_attach(device_t dev); static int at91_spi_detach(device_t dev); -static void at91_spi_intr(void *); /* helper routines */ static int at91_spi_activate(device_t dev); static void at91_spi_deactivate(device_t dev); -/* cdev routines */ -static d_open_t at91_spi_open; -static d_close_t at91_spi_close; -static d_ioctl_t at91_spi_ioctl; - -static struct cdevsw at91_spi_cdevsw = -{ - .d_version = D_VERSION, - .d_open = at91_spi_open, - .d_close = at91_spi_close, - .d_ioctl = at91_spi_ioctl -}; - static int at91_spi_probe(device_t dev) { @@ -116,7 +99,7 @@ at91_spi_attach(device_t dev) { struct at91_spi_softc *sc = device_get_softc(dev); - int err; + int err, i; sc->dev = dev; err = at91_spi_activate(dev); @@ -126,31 +109,45 @@ AT91_SPI_LOCK_INIT(sc); /* - * Activate the interrupt >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607220924.k6M9ObUv019564>