PERFORCE change 96987 for review
Marcel Moolenaar
marcel at FreeBSD.org
Fri May 12 00:22:07 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=96987
Change 96987 by marcel at marcel_nfs on 2006/05/12 00:21:05
IFC @96983
Affected files ...
.. //depot/projects/busdma/alpha/Makefile#2 delete
.. //depot/projects/busdma/alpha/alpha/api_up1000.c#2 delete
.. //depot/projects/busdma/alpha/alpha/atomic.s#2 delete
.. //depot/projects/busdma/alpha/alpha/autoconf.c#2 delete
.. //depot/projects/busdma/alpha/alpha/busdma_machdep.c#2 delete
.. //depot/projects/busdma/alpha/alpha/busspace.c#2 delete
.. //depot/projects/busdma/alpha/alpha/clock.c#2 delete
.. //depot/projects/busdma/alpha/alpha/clock_if.m#2 delete
.. //depot/projects/busdma/alpha/alpha/cpuconf.c#2 delete
.. //depot/projects/busdma/alpha/alpha/db_disasm.c#2 delete
.. //depot/projects/busdma/alpha/alpha/db_instruction.h#2 delete
.. //depot/projects/busdma/alpha/alpha/db_interface.c#2 delete
.. //depot/projects/busdma/alpha/alpha/db_trace.c#2 delete
.. //depot/projects/busdma/alpha/alpha/dec_1000a.c#2 delete
.. //depot/projects/busdma/alpha/alpha/dec_2100_a50.c#2 delete
.. //depot/projects/busdma/alpha/alpha/dec_2100_a500.c#2 delete
.. //depot/projects/busdma/alpha/alpha/dec_3000_300.c#2 delete
.. //depot/projects/busdma/alpha/alpha/dec_3000_500.c#2 delete
.. //depot/projects/busdma/alpha/alpha/dec_axppci_33.c#2 delete
.. //depot/projects/busdma/alpha/alpha/dec_eb164.c#2 delete
.. //depot/projects/busdma/alpha/alpha/dec_eb64plus.c#2 delete
.. //depot/projects/busdma/alpha/alpha/dec_kn20aa.c#2 delete
.. //depot/projects/busdma/alpha/alpha/dec_kn300.c#2 delete
.. //depot/projects/busdma/alpha/alpha/dec_kn8ae.c#2 delete
.. //depot/projects/busdma/alpha/alpha/dec_st550.c#2 delete
.. //depot/projects/busdma/alpha/alpha/dec_st6600.c#2 delete
.. //depot/projects/busdma/alpha/alpha/divrem.m4#2 delete
.. //depot/projects/busdma/alpha/alpha/dump_machdep.c#2 delete
.. //depot/projects/busdma/alpha/alpha/elf_machdep.c#2 delete
.. //depot/projects/busdma/alpha/alpha/exception.s#2 delete
.. //depot/projects/busdma/alpha/alpha/fp_emulate.c#2 delete
.. //depot/projects/busdma/alpha/alpha/gdb_machdep.c#2 delete
.. //depot/projects/busdma/alpha/alpha/genassym.c#2 delete
.. //depot/projects/busdma/alpha/alpha/ieee_float.c#2 delete
.. //depot/projects/busdma/alpha/alpha/ieee_float.h#2 delete
.. //depot/projects/busdma/alpha/alpha/in_cksum.c#2 delete
.. //depot/projects/busdma/alpha/alpha/interrupt.c#2 delete
.. //depot/projects/busdma/alpha/alpha/locore.s#2 delete
.. //depot/projects/busdma/alpha/alpha/machdep.c#2 delete
.. //depot/projects/busdma/alpha/alpha/mem.c#2 delete
.. //depot/projects/busdma/alpha/alpha/mp_machdep.c#2 delete
.. //depot/projects/busdma/alpha/alpha/pal.s#2 delete
.. //depot/projects/busdma/alpha/alpha/pmap.c#2 delete
.. //depot/projects/busdma/alpha/alpha/prom.c#2 delete
.. //depot/projects/busdma/alpha/alpha/prom_disp.s#2 delete
.. //depot/projects/busdma/alpha/alpha/promcons.c#2 delete
.. //depot/projects/busdma/alpha/alpha/sgmap.c#2 delete
.. //depot/projects/busdma/alpha/alpha/support.s#2 delete
.. //depot/projects/busdma/alpha/alpha/swtch.s#2 delete
.. //depot/projects/busdma/alpha/alpha/sys_machdep.c#2 delete
.. //depot/projects/busdma/alpha/alpha/trap.c#2 delete
.. //depot/projects/busdma/alpha/alpha/uio_machdep.c#2 delete
.. //depot/projects/busdma/alpha/alpha/uma_machdep.c#2 delete
.. //depot/projects/busdma/alpha/alpha/vm_machdep.c#2 delete
.. //depot/projects/busdma/alpha/compile/.cvsignore#2 delete
.. //depot/projects/busdma/alpha/conf/.cvsignore#2 delete
.. //depot/projects/busdma/alpha/conf/DEFAULTS#2 delete
.. //depot/projects/busdma/alpha/conf/GENERIC#2 delete
.. //depot/projects/busdma/alpha/conf/GENERIC.hints#2 delete
.. //depot/projects/busdma/alpha/conf/MAC#2 delete
.. //depot/projects/busdma/alpha/conf/Makefile#2 delete
.. //depot/projects/busdma/alpha/conf/NOTES#2 delete
.. //depot/projects/busdma/alpha/include/_bus.h#2 delete
.. //depot/projects/busdma/alpha/include/_inttypes.h#2 delete
.. //depot/projects/busdma/alpha/include/_limits.h#2 delete
.. //depot/projects/busdma/alpha/include/_stdint.h#2 delete
.. //depot/projects/busdma/alpha/include/_types.h#2 delete
.. //depot/projects/busdma/alpha/include/alpha_cpu.h#2 delete
.. //depot/projects/busdma/alpha/include/asm.h#2 delete
.. //depot/projects/busdma/alpha/include/atomic.h#2 delete
.. //depot/projects/busdma/alpha/include/bootinfo.h#2 delete
.. //depot/projects/busdma/alpha/include/bus.h#2 delete
.. //depot/projects/busdma/alpha/include/bus_dma.h#2 delete
.. //depot/projects/busdma/alpha/include/bwx.h#2 delete
.. //depot/projects/busdma/alpha/include/chipset.h#2 delete
.. //depot/projects/busdma/alpha/include/clock.h#2 delete
.. //depot/projects/busdma/alpha/include/clockvar.h#2 delete
.. //depot/projects/busdma/alpha/include/cpu.h#2 delete
.. //depot/projects/busdma/alpha/include/cpuconf.h#2 delete
.. //depot/projects/busdma/alpha/include/cpufunc.h#2 delete
.. //depot/projects/busdma/alpha/include/db_machdep.h#2 delete
.. //depot/projects/busdma/alpha/include/elf.h#2 delete
.. //depot/projects/busdma/alpha/include/endian.h#2 delete
.. //depot/projects/busdma/alpha/include/exec.h#2 delete
.. //depot/projects/busdma/alpha/include/float.h#2 delete
.. //depot/projects/busdma/alpha/include/floatingpoint.h#2 delete
.. //depot/projects/busdma/alpha/include/fpu.h#2 delete
.. //depot/projects/busdma/alpha/include/frame.h#2 delete
.. //depot/projects/busdma/alpha/include/gdb_machdep.h#2 delete
.. //depot/projects/busdma/alpha/include/ieee.h#2 delete
.. //depot/projects/busdma/alpha/include/ieeefp.h#2 delete
.. //depot/projects/busdma/alpha/include/in_cksum.h#2 delete
.. //depot/projects/busdma/alpha/include/inst.h#2 delete
.. //depot/projects/busdma/alpha/include/intr.h#2 delete
.. //depot/projects/busdma/alpha/include/intrcnt.h#2 delete
.. //depot/projects/busdma/alpha/include/ioctl_bt848.h#2 delete
.. //depot/projects/busdma/alpha/include/ioctl_meteor.h#2 delete
.. //depot/projects/busdma/alpha/include/kdb.h#2 delete
.. //depot/projects/busdma/alpha/include/limits.h#2 delete
.. //depot/projects/busdma/alpha/include/md_var.h#2 delete
.. //depot/projects/busdma/alpha/include/memdev.h#2 delete
.. //depot/projects/busdma/alpha/include/mutex.h#2 delete
.. //depot/projects/busdma/alpha/include/pal.h#2 delete
.. //depot/projects/busdma/alpha/include/param.h#2 delete
.. //depot/projects/busdma/alpha/include/pc/bios.h#2 delete
.. //depot/projects/busdma/alpha/include/pc/display.h#2 delete
.. //depot/projects/busdma/alpha/include/pc/vesa.h#2 delete
.. //depot/projects/busdma/alpha/include/pcb.h#2 delete
.. //depot/projects/busdma/alpha/include/pcpu.h#2 delete
.. //depot/projects/busdma/alpha/include/pmap.h#2 delete
.. //depot/projects/busdma/alpha/include/pmc_mdep.h#2 delete
.. //depot/projects/busdma/alpha/include/ppireg.h#2 delete
.. //depot/projects/busdma/alpha/include/proc.h#2 delete
.. //depot/projects/busdma/alpha/include/profile.h#2 delete
.. //depot/projects/busdma/alpha/include/prom.h#2 delete
.. //depot/projects/busdma/alpha/include/pte.h#2 delete
.. //depot/projects/busdma/alpha/include/ptrace.h#2 delete
.. //depot/projects/busdma/alpha/include/reg.h#2 delete
.. //depot/projects/busdma/alpha/include/reloc.h#2 delete
.. //depot/projects/busdma/alpha/include/resource.h#2 delete
.. //depot/projects/busdma/alpha/include/rpb.h#2 delete
.. //depot/projects/busdma/alpha/include/runq.h#2 delete
.. //depot/projects/busdma/alpha/include/setjmp.h#2 delete
.. //depot/projects/busdma/alpha/include/sf_buf.h#2 delete
.. //depot/projects/busdma/alpha/include/sgmap.h#2 delete
.. //depot/projects/busdma/alpha/include/sigframe.h#2 delete
.. //depot/projects/busdma/alpha/include/signal.h#2 delete
.. //depot/projects/busdma/alpha/include/smp.h#2 delete
.. //depot/projects/busdma/alpha/include/stdarg.h#2 delete
.. //depot/projects/busdma/alpha/include/swiz.h#2 delete
.. //depot/projects/busdma/alpha/include/sysarch.h#2 delete
.. //depot/projects/busdma/alpha/include/timerreg.h#2 delete
.. //depot/projects/busdma/alpha/include/ucontext.h#2 delete
.. //depot/projects/busdma/alpha/include/varargs.h#2 delete
.. //depot/projects/busdma/alpha/include/vmparam.h#2 delete
.. //depot/projects/busdma/alpha/isa/isa.c#2 delete
.. //depot/projects/busdma/alpha/isa/isa_dma.c#2 delete
.. //depot/projects/busdma/alpha/isa/isavar.h#2 delete
.. //depot/projects/busdma/alpha/isa/mcclock_isa.c#2 delete
.. //depot/projects/busdma/alpha/linux/Makefile#2 delete
.. //depot/projects/busdma/alpha/linux/linux.h#2 delete
.. //depot/projects/busdma/alpha/linux/linux_dummy.c#2 delete
.. //depot/projects/busdma/alpha/linux/linux_genassym.c#2 delete
.. //depot/projects/busdma/alpha/linux/linux_ipc64.h#2 delete
.. //depot/projects/busdma/alpha/linux/linux_locore.s#2 delete
.. //depot/projects/busdma/alpha/linux/linux_machdep.c#2 delete
.. //depot/projects/busdma/alpha/linux/linux_proto.h#2 delete
.. //depot/projects/busdma/alpha/linux/linux_syscall.h#2 delete
.. //depot/projects/busdma/alpha/linux/linux_sysent.c#2 delete
.. //depot/projects/busdma/alpha/linux/linux_sysvec.c#2 delete
.. //depot/projects/busdma/alpha/linux/syscalls.conf#2 delete
.. //depot/projects/busdma/alpha/linux/syscalls.master#2 delete
.. //depot/projects/busdma/alpha/mcbus/mcbus.c#2 delete
.. //depot/projects/busdma/alpha/mcbus/mcbusreg.h#2 delete
.. //depot/projects/busdma/alpha/mcbus/mcbusvar.h#2 delete
.. //depot/projects/busdma/alpha/mcbus/mcmem.c#2 delete
.. //depot/projects/busdma/alpha/mcbus/mcpcia.c#2 delete
.. //depot/projects/busdma/alpha/mcbus/mcpciareg.h#2 delete
.. //depot/projects/busdma/alpha/mcbus/mcpciavar.h#2 delete
.. //depot/projects/busdma/alpha/osf1/Makefile#2 delete
.. //depot/projects/busdma/alpha/osf1/README.mach-traps#2 delete
.. //depot/projects/busdma/alpha/osf1/exec_ecoff.h#2 delete
.. //depot/projects/busdma/alpha/osf1/imgact_osf1.c#2 delete
.. //depot/projects/busdma/alpha/osf1/osf1.h#2 delete
.. //depot/projects/busdma/alpha/osf1/osf1_ioctl.c#2 delete
.. //depot/projects/busdma/alpha/osf1/osf1_misc.c#2 delete
.. //depot/projects/busdma/alpha/osf1/osf1_mount.c#2 delete
.. //depot/projects/busdma/alpha/osf1/osf1_proto.h#2 delete
.. //depot/projects/busdma/alpha/osf1/osf1_signal.c#2 delete
.. //depot/projects/busdma/alpha/osf1/osf1_signal.h#2 delete
.. //depot/projects/busdma/alpha/osf1/osf1_syscall.h#2 delete
.. //depot/projects/busdma/alpha/osf1/osf1_sysent.c#2 delete
.. //depot/projects/busdma/alpha/osf1/osf1_sysvec.c#2 delete
.. //depot/projects/busdma/alpha/osf1/osf1_util.h#2 delete
.. //depot/projects/busdma/alpha/osf1/syscalls.conf#2 delete
.. //depot/projects/busdma/alpha/osf1/syscalls.master#2 delete
.. //depot/projects/busdma/alpha/pci/alphapci_if.m#2 delete
.. //depot/projects/busdma/alpha/pci/apecs.c#2 delete
.. //depot/projects/busdma/alpha/pci/apecs_pci.c#2 delete
.. //depot/projects/busdma/alpha/pci/apecsreg.h#2 delete
.. //depot/projects/busdma/alpha/pci/apecsvar.h#2 delete
.. //depot/projects/busdma/alpha/pci/bwx.c#2 delete
.. //depot/projects/busdma/alpha/pci/cia.c#2 delete
.. //depot/projects/busdma/alpha/pci/cia_pci.c#2 delete
.. //depot/projects/busdma/alpha/pci/ciareg.h#2 delete
.. //depot/projects/busdma/alpha/pci/ciavar.h#2 delete
.. //depot/projects/busdma/alpha/pci/irongate.c#2 delete
.. //depot/projects/busdma/alpha/pci/irongate_pci.c#2 delete
.. //depot/projects/busdma/alpha/pci/irongatereg.h#2 delete
.. //depot/projects/busdma/alpha/pci/irongatevar.h#2 delete
.. //depot/projects/busdma/alpha/pci/lca.c#2 delete
.. //depot/projects/busdma/alpha/pci/lca_pci.c#2 delete
.. //depot/projects/busdma/alpha/pci/lcareg.h#2 delete
.. //depot/projects/busdma/alpha/pci/lcavar.h#2 delete
.. //depot/projects/busdma/alpha/pci/pci_eb164_intr.s#2 delete
.. //depot/projects/busdma/alpha/pci/pci_eb64plus_intr.s#2 delete
.. //depot/projects/busdma/alpha/pci/pcibus.c#2 delete
.. //depot/projects/busdma/alpha/pci/pcibus.h#2 delete
.. //depot/projects/busdma/alpha/pci/swiz.c#2 delete
.. //depot/projects/busdma/alpha/pci/t2.c#2 delete
.. //depot/projects/busdma/alpha/pci/t2_pci.c#2 delete
.. //depot/projects/busdma/alpha/pci/t2reg.h#2 delete
.. //depot/projects/busdma/alpha/pci/t2var.h#2 delete
.. //depot/projects/busdma/alpha/pci/tsunami.c#2 delete
.. //depot/projects/busdma/alpha/pci/tsunami_pci.c#2 delete
.. //depot/projects/busdma/alpha/pci/tsunamireg.h#2 delete
.. //depot/projects/busdma/alpha/pci/tsunamivar.h#2 delete
.. //depot/projects/busdma/alpha/tlsb/dwlpx.c#2 delete
.. //depot/projects/busdma/alpha/tlsb/dwlpxreg.h#2 delete
.. //depot/projects/busdma/alpha/tlsb/dwlpxvar.h#2 delete
.. //depot/projects/busdma/alpha/tlsb/gbus.c#2 delete
.. //depot/projects/busdma/alpha/tlsb/gbusreg.h#2 delete
.. //depot/projects/busdma/alpha/tlsb/gbusvar.h#2 delete
.. //depot/projects/busdma/alpha/tlsb/kftxx.c#2 delete
.. //depot/projects/busdma/alpha/tlsb/kftxxreg.h#2 delete
.. //depot/projects/busdma/alpha/tlsb/kftxxvar.h#2 delete
.. //depot/projects/busdma/alpha/tlsb/mcclock_tlsb.c#2 delete
.. //depot/projects/busdma/alpha/tlsb/tlsb.c#2 delete
.. //depot/projects/busdma/alpha/tlsb/tlsbcpu.c#2 delete
.. //depot/projects/busdma/alpha/tlsb/tlsbmem.c#2 delete
.. //depot/projects/busdma/alpha/tlsb/tlsbreg.h#2 delete
.. //depot/projects/busdma/alpha/tlsb/tlsbvar.h#2 delete
.. //depot/projects/busdma/alpha/tlsb/zs_tlsb.c#2 delete
.. //depot/projects/busdma/alpha/tlsb/zsreg.h#2 delete
.. //depot/projects/busdma/alpha/tlsb/zsvar.h#2 delete
.. //depot/projects/busdma/amd64/amd64/machdep.c#2 integrate
.. //depot/projects/busdma/amd64/conf/GENERIC#2 integrate
.. //depot/projects/busdma/amd64/conf/NOTES#2 integrate
.. //depot/projects/busdma/amd64/include/cpu.h#2 integrate
.. //depot/projects/busdma/amd64/linux32/linux32_dummy.c#2 integrate
.. //depot/projects/busdma/amd64/linux32/linux32_proto.h#2 integrate
.. //depot/projects/busdma/amd64/linux32/linux32_syscall.h#2 integrate
.. //depot/projects/busdma/amd64/linux32/linux32_sysent.c#2 integrate
.. //depot/projects/busdma/amd64/linux32/linux32_sysvec.c#2 integrate
.. //depot/projects/busdma/amd64/linux32/syscalls.master#2 integrate
.. //depot/projects/busdma/arm/arm/machdep.c#2 integrate
.. //depot/projects/busdma/arm/at91/at91_pdcreg.h#1 branch
.. //depot/projects/busdma/arm/at91/uart_bus_at91usart.c#2 integrate
.. //depot/projects/busdma/arm/include/cpu.h#2 integrate
.. //depot/projects/busdma/arm/xscale/i80321/iq80321.c#2 integrate
.. //depot/projects/busdma/boot/alpha/Makefile#2 delete
.. //depot/projects/busdma/boot/alpha/Makefile.inc#2 delete
.. //depot/projects/busdma/boot/alpha/boot1/Makefile#2 delete
.. //depot/projects/busdma/boot/alpha/boot1/boot1.c#2 delete
.. //depot/projects/busdma/boot/alpha/cdboot/Makefile#2 delete
.. //depot/projects/busdma/boot/alpha/cdboot/version#2 delete
.. //depot/projects/busdma/boot/alpha/common/Makefile.common#2 delete
.. //depot/projects/busdma/boot/alpha/common/conf.c#2 delete
.. //depot/projects/busdma/boot/alpha/common/help.alpha#2 delete
.. //depot/projects/busdma/boot/alpha/common/ldscript#2 delete
.. //depot/projects/busdma/boot/alpha/common/main.c#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/Makefile#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/OSFpal.c#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/alpha_copy.c#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/alpha_module.c#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/bbinfo.h#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/bootinfo.c#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/common.h#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/delay.c#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/devicename.c#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/elf_freebsd.c#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/getsecs.c#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/libalpha.h#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/pal.S#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/prom.c#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/prom_disp.S#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/prom_swpal.S#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/reboot.c#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/srmdisk.c#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/srmnet.c#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/start.S#2 delete
.. //depot/projects/busdma/boot/alpha/libalpha/time.c#2 delete
.. //depot/projects/busdma/boot/alpha/loader/Makefile#2 delete
.. //depot/projects/busdma/boot/alpha/loader/version#2 delete
.. //depot/projects/busdma/boot/alpha/netboot/Makefile#2 delete
.. //depot/projects/busdma/boot/alpha/netboot/version#2 delete
.. //depot/projects/busdma/boot/arc/Makefile#2 delete
.. //depot/projects/busdma/boot/arc/Makefile.inc#2 delete
.. //depot/projects/busdma/boot/arc/include/arcfuncs.h#2 delete
.. //depot/projects/busdma/boot/arc/include/arctypes.h#2 delete
.. //depot/projects/busdma/boot/arc/include/libarc.h#2 delete
.. //depot/projects/busdma/boot/arc/lib/Makefile#2 delete
.. //depot/projects/busdma/boot/arc/lib/abort.c#2 delete
.. //depot/projects/busdma/boot/arc/lib/arcconsole.c#2 delete
.. //depot/projects/busdma/boot/arc/lib/arcdisk.c#2 delete
.. //depot/projects/busdma/boot/arc/lib/arch/alpha/copy.c#2 delete
.. //depot/projects/busdma/boot/arc/lib/arch/alpha/rpb.c#2 delete
.. //depot/projects/busdma/boot/arc/lib/arch/alpha/setjmp.S#2 delete
.. //depot/projects/busdma/boot/arc/lib/arch/alpha/start.S#2 delete
.. //depot/projects/busdma/boot/arc/lib/bootinfo.c#2 delete
.. //depot/projects/busdma/boot/arc/lib/delay.c#2 delete
.. //depot/projects/busdma/boot/arc/lib/devicename.c#2 delete
.. //depot/projects/busdma/boot/arc/lib/elf_freebsd.c#2 delete
.. //depot/projects/busdma/boot/arc/lib/module.c#2 delete
.. //depot/projects/busdma/boot/arc/lib/prom.c#2 delete
.. //depot/projects/busdma/boot/arc/lib/setjmperr.c#2 delete
.. //depot/projects/busdma/boot/arc/lib/time.c#2 delete
.. //depot/projects/busdma/boot/arc/loader/Makefile#2 delete
.. //depot/projects/busdma/boot/arc/loader/conf.c#2 delete
.. //depot/projects/busdma/boot/arc/loader/help.alpha#2 delete
.. //depot/projects/busdma/boot/arc/loader/main.c#2 delete
.. //depot/projects/busdma/boot/arc/loader/version#2 delete
.. //depot/projects/busdma/boot/pc98/boot2/io.c#2 integrate
.. //depot/projects/busdma/compat/linprocfs/linprocfs.c#2 integrate
.. //depot/projects/busdma/compat/linsysfs/linsysfs.c#1 branch
.. //depot/projects/busdma/compat/linux/linux_file.c#2 integrate
.. //depot/projects/busdma/compat/linux/linux_ioctl.c#2 integrate
.. //depot/projects/busdma/compat/linux/linux_ioctl.h#2 integrate
.. //depot/projects/busdma/compat/linux/linux_misc.c#2 integrate
.. //depot/projects/busdma/compat/linux/linux_signal.c#2 integrate
.. //depot/projects/busdma/compat/linux/linux_socket.c#2 integrate
.. //depot/projects/busdma/compat/linux/linux_stats.c#2 integrate
.. //depot/projects/busdma/compat/linux/linux_util.c#2 integrate
.. //depot/projects/busdma/compat/linux/linux_util.h#2 integrate
.. //depot/projects/busdma/conf/Makefile.alpha#2 delete
.. //depot/projects/busdma/conf/NOTES#2 integrate
.. //depot/projects/busdma/conf/files#2 integrate
.. //depot/projects/busdma/conf/files.alpha#2 delete
.. //depot/projects/busdma/conf/files.amd64#2 integrate
.. //depot/projects/busdma/conf/files.i386#2 integrate
.. //depot/projects/busdma/conf/files.pc98#2 integrate
.. //depot/projects/busdma/conf/kern.mk#2 integrate
.. //depot/projects/busdma/conf/ldscript.alpha#2 delete
.. //depot/projects/busdma/conf/options#2 integrate
.. //depot/projects/busdma/conf/options.alpha#2 delete
.. //depot/projects/busdma/conf/options.amd64#2 integrate
.. //depot/projects/busdma/conf/options.i386#2 integrate
.. //depot/projects/busdma/conf/options.pc98#2 integrate
.. //depot/projects/busdma/ddb/db_ps.c#2 integrate
.. //depot/projects/busdma/dev/acpica/acpi.c#2 integrate
.. //depot/projects/busdma/dev/acpica/acpi_pci.c#2 integrate
.. //depot/projects/busdma/dev/acpica/acpi_resource.c#2 integrate
.. //depot/projects/busdma/dev/ata/ata-chipset.c#2 integrate
.. //depot/projects/busdma/dev/ath/if_ath.c#2 integrate
.. //depot/projects/busdma/dev/ath/if_ath_pci.c#2 integrate
.. //depot/projects/busdma/dev/ath/if_athvar.h#2 integrate
.. //depot/projects/busdma/dev/bce/if_bcereg.h#2 integrate
.. //depot/projects/busdma/dev/bfe/if_bfe.c#2 integrate
.. //depot/projects/busdma/dev/bfe/if_bfereg.h#2 integrate
.. //depot/projects/busdma/dev/dec/mc146818reg.h#2 delete
.. //depot/projects/busdma/dev/dec/mcclock.c#2 delete
.. //depot/projects/busdma/dev/dec/mcclock_if.m#2 delete
.. //depot/projects/busdma/dev/dec/mcclockvar.h#2 delete
.. //depot/projects/busdma/dev/ed/if_ed_pccard.c#2 integrate
.. //depot/projects/busdma/dev/hwpmc/hwpmc_alpha.c#2 delete
.. //depot/projects/busdma/dev/mpt/mpt.h#2 integrate
.. //depot/projects/busdma/dev/mpt/mpt_cam.c#2 integrate
.. //depot/projects/busdma/dev/mpt/mpt_pci.c#2 integrate
.. //depot/projects/busdma/dev/pccard/pccarddevs#2 integrate
.. //depot/projects/busdma/dev/pci/pci.c#2 integrate
.. //depot/projects/busdma/dev/rr232x/osm_bsd.c#2 integrate
.. //depot/projects/busdma/dev/tga/tga_pci.c#2 delete
.. //depot/projects/busdma/dev/tga/tga_pci.h#2 delete
.. //depot/projects/busdma/dev/uart/uart_cpu_alpha.c#2 delete
.. //depot/projects/busdma/geom/raid3/g_raid3.c#2 integrate
.. //depot/projects/busdma/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate
.. //depot/projects/busdma/i386/conf/NOTES#2 integrate
.. //depot/projects/busdma/i386/conf/PAE#2 integrate
.. //depot/projects/busdma/i386/cpufreq/est.c#2 integrate
.. //depot/projects/busdma/i386/i386/machdep.c#2 integrate
.. //depot/projects/busdma/i386/include/cpu.h#2 integrate
.. //depot/projects/busdma/i386/linux/linux_dummy.c#2 integrate
.. //depot/projects/busdma/i386/linux/linux_proto.h#2 integrate
.. //depot/projects/busdma/i386/linux/linux_syscall.h#2 integrate
.. //depot/projects/busdma/i386/linux/linux_sysent.c#2 integrate
.. //depot/projects/busdma/i386/linux/linux_sysvec.c#2 integrate
.. //depot/projects/busdma/i386/linux/syscalls.master#2 integrate
.. //depot/projects/busdma/ia64/ia64/clock.c#2 integrate
.. //depot/projects/busdma/ia64/include/cpu.h#2 integrate
.. //depot/projects/busdma/kern/kern_exec.c#2 integrate
.. //depot/projects/busdma/kern/kern_sig.c#2 integrate
.. //depot/projects/busdma/kern/kern_umtx.c#2 integrate
.. //depot/projects/busdma/kern/subr_clock.c#2 integrate
.. //depot/projects/busdma/kern/tty_cons.c#2 integrate
.. //depot/projects/busdma/kern/vfs_aio.c#2 integrate
.. //depot/projects/busdma/libkern/alpha/bswap16.S#2 delete
.. //depot/projects/busdma/libkern/alpha/bswap32.S#2 delete
.. //depot/projects/busdma/libkern/alpha/byte_swap_2.S#2 delete
.. //depot/projects/busdma/libkern/alpha/byte_swap_4.S#2 delete
.. //depot/projects/busdma/modules/Makefile#2 integrate
.. //depot/projects/busdma/modules/ath_hal/Makefile#2 integrate
.. //depot/projects/busdma/modules/linsysfs/Makefile#1 branch
.. //depot/projects/busdma/modules/linux/Makefile#2 integrate
.. //depot/projects/busdma/modules/rr232x/Makefile#2 integrate
.. //depot/projects/busdma/net/bpf.c#2 integrate
.. //depot/projects/busdma/net/if_gre.c#2 integrate
.. //depot/projects/busdma/net/route.c#2 integrate
.. //depot/projects/busdma/netinet/ip_fw2.c#2 integrate
.. //depot/projects/busdma/netinet/ip_input.c#2 integrate
.. //depot/projects/busdma/netinet/ip_ipsec.c#2 integrate
.. //depot/projects/busdma/netinet/tcp_timer.c#2 integrate
.. //depot/projects/busdma/netinet/udp_usrreq.c#2 integrate
.. //depot/projects/busdma/netinet6/frag6.c#2 integrate
.. //depot/projects/busdma/netinet6/ip6_forward.c#2 integrate
.. //depot/projects/busdma/nfsclient/nfs_socket.c#2 integrate
.. //depot/projects/busdma/pc98/cbus/cbus.h#2 integrate
.. //depot/projects/busdma/pc98/cbus/fdc.c#2 integrate
.. //depot/projects/busdma/pc98/cbus/syscons_cbus.c#2 integrate
.. //depot/projects/busdma/pc98/conf/GENERIC#2 integrate
.. //depot/projects/busdma/pc98/conf/NOTES#2 integrate
.. //depot/projects/busdma/pc98/pc98/machdep.c#2 integrate
.. //depot/projects/busdma/pc98/pc98/pc98_machdep.c#2 integrate
.. //depot/projects/busdma/pc98/pc98/pc98_machdep.h#2 integrate
.. //depot/projects/busdma/powerpc/include/cpu.h#2 integrate
.. //depot/projects/busdma/powerpc/powerpc/clock.c#2 integrate
.. //depot/projects/busdma/sparc64/include/cpu.h#2 integrate
.. //depot/projects/busdma/sys/mount.h#2 integrate
.. //depot/projects/busdma/ufs/ffs/ffs_rawread.c#2 integrate
.. //depot/projects/busdma/ufs/ffs/ffs_snapshot.c#2 integrate
.. //depot/projects/busdma/ufs/ffs/ffs_softdep.c#2 integrate
.. //depot/projects/busdma/ufs/ffs/ffs_vnops.c#2 integrate
.. //depot/projects/busdma/ufs/ufs/ufs_inode.c#2 integrate
.. //depot/projects/busdma/ufs/ufs/ufs_quota.c#2 integrate
.. //depot/projects/busdma/vm/swap_pager.c#2 integrate
Differences ...
==== //depot/projects/busdma/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.648 2006/03/14 16:13:54 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.649 2006/05/11 17:29:22 phk Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -639,13 +639,13 @@
return (error);
}
-SYSCTL_PROC(_machdep, CPU_ADJKERNTZ, adjkerntz, CTLTYPE_INT|CTLFLAG_RW,
+SYSCTL_PROC(_machdep, OID_AUTO, adjkerntz, CTLTYPE_INT|CTLFLAG_RW,
&adjkerntz, 0, sysctl_machdep_adjkerntz, "I", "");
-SYSCTL_INT(_machdep, CPU_DISRTCSET, disable_rtc_set,
+SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set,
CTLFLAG_RW, &disable_rtc_set, 0, "");
-SYSCTL_INT(_machdep, CPU_WALLCLOCK, wall_cmos_clock,
+SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock,
CTLFLAG_RW, &wall_cmos_clock, 0, "");
/*
==== //depot/projects/busdma/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.455 2006/05/03 18:15:36 sam Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.456 2006/05/09 22:27:00 ambrisko Exp $
cpu HAMMER
ident GENERIC
@@ -75,6 +75,7 @@
# Linux 32-bit ABI support
options COMPAT_LINUX32 # Compatible with i386 linux binaries
options LINPROCFS # Cannot be a module yet.
+options LINSYSFS
# Bus support.
device acpi
==== //depot/projects/busdma/amd64/conf/NOTES#2 (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.53 2006/04/28 05:23:10 scottl Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.54 2006/05/09 22:27:00 ambrisko Exp $
#
#
@@ -507,6 +507,10 @@
# and PSEUDOFS)
options LINPROCFS
+#Enable the linux-like sys filesystem support (requires COMPAT_LINUX32
+# and PSEUDOFS)
+options LINSYSFS
+
#
# SysVR4 ABI emulation
#
==== //depot/projects/busdma/amd64/include/cpu.h#2 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* from: @(#)cpu.h 5.4 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.75 2005/12/22 22:16:05 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.76 2006/05/11 17:29:24 phk Exp $
*/
#ifndef _MACHINE_CPU_H_
@@ -59,15 +59,6 @@
(ISPL((framep)->tf_cs) == SEL_UPL)
#define TRAPF_PC(framep) ((framep)->tf_rip)
-/*
- * CTL_MACHDEP definitions.
- */
-#define CPU_CONSDEV 1 /* dev_t: console terminal device */
-#define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */
-#define CPU_DISRTCSET 3 /* int: disable resettodr() call */
-#define CPU_WALLCLOCK 5 /* int: indicates wall CMOS clock */
-#define CPU_MAXID 6 /* number of valid machdep ids */
-
#ifdef _KERNEL
extern char btext[];
extern char etext[];
==== //depot/projects/busdma/amd64/linux32/linux32_dummy.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.1 2004/08/16 07:55:06 tjr Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.2 2006/05/10 18:17:28 netchild Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,7 +54,6 @@
DUMMY(query_module);
DUMMY(nfsservctl);
DUMMY(prctl);
-DUMMY(rt_sigpending);
DUMMY(rt_sigtimedwait);
DUMMY(rt_sigqueueinfo);
DUMMY(capget);
==== //depot/projects/busdma/amd64/linux32/linux32_proto.h#2 (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.10 2006/03/20 18:54:29 netchild Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.8 2006/03/20 18:53:26 netchild Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.11 2006/05/10 18:19:51 netchild Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -534,7 +534,8 @@
char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)];
};
struct linux_rt_sigpending_args {
- register_t dummy;
+ char set_l_[PADL_(l_sigset_t *)]; l_sigset_t * set; char set_r_[PADR_(l_sigset_t *)];
+ char sigsetsize_l_[PADL_(l_size_t)]; l_size_t sigsetsize; char sigsetsize_r_[PADR_(l_size_t)];
};
struct linux_rt_sigtimedwait_args {
register_t dummy;
==== //depot/projects/busdma/amd64/linux32/linux32_syscall.h#2 (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.10 2006/03/20 18:54:29 netchild Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.8 2006/03/20 18:53:26 netchild Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.11 2006/05/10 18:19:51 netchild Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp
*/
#define LINUX_SYS_exit 1
==== //depot/projects/busdma/amd64/linux32/linux32_sysent.c#2 (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.10 2006/03/20 18:54:29 netchild Exp $
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.8 2006/03/20 18:53:26 netchild Exp
+ * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.11 2006/05/10 18:19:51 netchild Exp $
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp
*/
#include <bsm/audit_kevents.h>
@@ -196,7 +196,7 @@
{ SYF_MPSAFE | AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 173 = linux_rt_sigreturn */
{ SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 174 = linux_rt_sigaction */
{ SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 175 = linux_rt_sigprocmask */
- { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigpending, AUE_NULL }, /* 176 = linux_rt_sigpending */
+ { SYF_MPSAFE | AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL }, /* 176 = linux_rt_sigpending */
{ SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 177 = linux_rt_sigtimedwait */
{ SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 178 = linux_rt_sigqueueinfo */
{ SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 179 = linux_rt_sigsuspend */
==== //depot/projects/busdma/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.17 2006/03/19 11:10:32 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.18 2006/05/06 17:26:45 ambrisko Exp $");
#include "opt_compat.h"
#ifndef COMPAT_IA32
@@ -109,6 +109,7 @@
extern struct sysent linux_sysent[LINUX_SYS_MAXSYSCALL];
SET_DECLARE(linux_ioctl_handler_set, struct linux_ioctl_handler);
+SET_DECLARE(linux_device_handler_set, struct linux_device_handler);
static int elf_linux_fixup(register_t **stack_base,
struct image_params *iparams);
@@ -1047,6 +1048,7 @@
Elf32_Brandinfo **brandinfo;
int error;
struct linux_ioctl_handler **lihp;
+ struct linux_device_handler **ldhp;
error = 0;
@@ -1059,6 +1061,8 @@
if (error == 0) {
SET_FOREACH(lihp, linux_ioctl_handler_set)
linux_ioctl_register_handler(*lihp);
+ SET_FOREACH(ldhp, linux_device_handler_set)
+ linux_device_register_handler(*ldhp);
if (bootverbose)
printf("Linux ELF exec handler installed\n");
} else
@@ -1078,6 +1082,8 @@
if (error == 0) {
SET_FOREACH(lihp, linux_ioctl_handler_set)
linux_ioctl_unregister_handler(*lihp);
+ SET_FOREACH(ldhp, linux_device_handler_set)
+ linux_device_unregister_handler(*ldhp);
if (bootverbose)
printf("Linux ELF exec handler removed\n");
} else
==== //depot/projects/busdma/amd64/linux32/syscalls.master#2 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.8 2006/03/20 18:53:26 netchild Exp $
+ $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.9 2006/05/10 18:17:28 netchild Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from LINUX).
@@ -308,7 +308,8 @@
175 AUE_NULL MSTD { int linux_rt_sigprocmask(l_int how, \
l_sigset_t *mask, l_sigset_t *omask, \
l_size_t sigsetsize); }
-176 AUE_NULL MSTD { int linux_rt_sigpending(void); }
+176 AUE_NULL MSTD { int linux_rt_sigpending(l_sigset_t *set, \
+ l_size_t sigsetsize); }
177 AUE_NULL MSTD { int linux_rt_sigtimedwait(void); }
178 AUE_NULL MSTD { int linux_rt_sigqueueinfo(void); }
179 AUE_NULL MSTD { int linux_rt_sigsuspend( \
==== //depot/projects/busdma/arm/arm/machdep.c#2 (text+ko) ====
@@ -44,7 +44,7 @@
#include "opt_compat.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.21 2006/02/22 18:57:49 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.22 2006/05/10 13:39:10 cognet Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -232,6 +232,7 @@
vm_page_t m;
#endif
+ cpu_setup("");
vm_ksubmap_init(&kmi);
bufinit();
vm_pager_bufferinit();
@@ -241,7 +242,6 @@
USPACE_SVC_STACK_TOP;
vector_page_setprot(VM_PROT_READ);
pmap_set_pcb_pagedir(pmap_kernel(), pcb);
- cpu_setup("");
identify_arm_cpu();
thread0.td_frame = (struct trapframe *)pcb->un_32.pcb32_sp - 1;
pmap_postinit();
==== //depot/projects/busdma/arm/at91/uart_bus_at91usart.c#2 (text) ====
@@ -25,7 +25,7 @@
#include "opt_uart.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/uart_bus_at91usart.c,v 1.1 2006/02/04 23:32:13 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/uart_bus_at91usart.c,v 1.2 2006/05/11 14:30:28 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,7 +104,7 @@
break;
}
sc->sc_class = &at91_usart_class;
- return (uart_bus_probe(dev, 0, 0, 0, device_get_unit(dev), 0));
+ return (uart_bus_probe(dev, 0, 0, 0, 0));
}
==== //depot/projects/busdma/arm/include/cpu.h#2 (text+ko) ====
@@ -1,5 +1,5 @@
/* $NetBSD: cpu.h,v 1.2 2001/02/23 21:23:52 reinoud Exp $ */
-/* $FreeBSD: src/sys/arm/include/cpu.h,v 1.5 2005/12/22 22:16:06 jhb Exp $ */
+/* $FreeBSD: src/sys/arm/include/cpu.h,v 1.6 2006/05/11 17:29:24 phk Exp $ */
#ifndef MACHINE_CPU_H
#define MACHINE_CPU_H
@@ -21,14 +21,6 @@
}
#endif
-#define CPU_CONSDEV 1
-#define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */
-#define CPU_DISRTCSET 3 /* int: disable resettodr() call */
-#define CPU_BOOTINFO 4 /* struct: bootinfo */
-#define CPU_WALLCLOCK 5 /* int: indicates wall CMOS clock */
-#define CPU_MAXID 6 /* number of valid machdep ids */
-
-
#define TRAPF_USERMODE(frame) ((frame->tf_spsr & PSR_MODE) == PSR_USR32_MODE)
#define TRAPF_PC(tfp) ((tfp)->tf_pc)
==== //depot/projects/busdma/arm/xscale/i80321/iq80321.c#2 (text+ko) ====
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq80321.c,v 1.11 2006/04/20 04:12:02 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq80321.c,v 1.12 2006/05/05 19:14:57 cognet Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -307,6 +307,7 @@
start, end, count, flags, child);
if (rv != NULL)
rman_set_rid(rv, *rid);
+ return (rv);
}
return (NULL);
}
==== //depot/projects/busdma/boot/pc98/boot2/io.c#2 (text+ko) ====
@@ -27,12 +27,12 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/io.c,v 1.9 2005/09/14 12:39:06 nyan Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/io.c,v 1.10 2006/05/09 14:20:17 nyan Exp $");
#include "boot.h"
#include <machine/cpufunc.h>
#include <sys/reboot.h>
-#include <pc98/cbus/cbus.h>
+#include <pc98/pc98/pc98_machdep.h>
static int getchar(int in_buf);
==== //depot/projects/busdma/compat/linprocfs/linprocfs.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.91 2005/12/11 21:37:42 mlaier Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.92 2006/05/05 16:10:45 ambrisko Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -388,8 +388,13 @@
else if (strcmp(fstype, "procfs") == 0)
continue;
- sbuf_printf(sb, "%s %s %s %s", mntfrom, mntto, fstype,
- mp->mnt_stat.f_flags & MNT_RDONLY ? "ro" : "rw");
+ if (strcmp(fstype, "linsysfs") == 0) {
+ sbuf_printf(sb, "/sys %s sysfs %s", mntto,
+ mp->mnt_stat.f_flags & MNT_RDONLY ? "ro" : "rw");
+ } else {
+ sbuf_printf(sb, "%s %s %s %s", mntfrom, mntto, fstype,
+ mp->mnt_stat.f_flags & MNT_RDONLY ? "ro" : "rw");
+ }
#define ADD_OPTION(opt, name) \
if (mp->mnt_stat.f_flags & (opt)) sbuf_printf(sb, "," name);
ADD_OPTION(MNT_SYNCHRONOUS, "sync");
@@ -952,7 +957,24 @@
return (0);
}
-#if 0
+/*
+ * Filler function for proc/scsi/device_info
+ */
+static int
+linprocfs_doscsidevinfo(PFS_FILL_ARGS)
+{
+ return (0);
+}
+
+/*
+ * Filler function for proc/scsi/scsi
+ */
+static int
+linprocfs_doscsiscsi(PFS_FILL_ARGS)
+{
+ return (0);
+}
+
extern struct cdevsw *cdevsw[];
/*
@@ -961,19 +983,17 @@
static int
linprocfs_dodevices(PFS_FILL_ARGS)
{
- int i;
-
+ char *char_devices;
sbuf_printf(sb, "Character devices:\n");
- for (i = 0; i < NUMCDEVSW; i++)
- if (cdevsw[i] != NULL)
- sbuf_printf(sb, "%3d %s\n", i, cdevsw[i]->d_name);
+ char_devices = linux_get_char_devices();
+ sbuf_printf(sb, "%s", char_devices);
+ linux_free_get_char_devices(char_devices);
sbuf_printf(sb, "\nBlock devices:\n");
return (0);
}
-#endif
/*
* Filler function for proc/cmdline
@@ -1019,10 +1039,8 @@
NULL, NULL, PFS_RD);
pfs_create_file(root, "cpuinfo", &linprocfs_docpuinfo,
NULL, NULL, PFS_RD);
-#if 0
pfs_create_file(root, "devices", &linprocfs_dodevices,
NULL, NULL, PFS_RD);
-#endif
pfs_create_file(root, "loadavg", &linprocfs_doloadavg,
NULL, NULL, PFS_RD);
pfs_create_file(root, "meminfo", &linprocfs_domeminfo,
@@ -1031,6 +1049,8 @@
pfs_create_file(root, "modules", &linprocfs_domodules,
NULL, NULL, PFS_RD);
#endif
+ pfs_create_file(root, "mounts", &linprocfs_domtab,
+ NULL, NULL, PFS_RD);
pfs_create_file(root, "mtab", &linprocfs_domtab,
NULL, NULL, PFS_RD);
pfs_create_link(root, "self", &procfs_docurproc,
@@ -1070,6 +1090,12 @@
pfs_create_file(dir, "status", &linprocfs_doprocstatus,
NULL, NULL, PFS_RD);
+ /* /proc/scsi/... */
+ dir = pfs_create_dir(root, "scsi", NULL, NULL, 0);
+ pfs_create_file(dir, "device_info", &linprocfs_doscsidevinfo,
+ NULL, NULL, PFS_RD);
+ pfs_create_file(dir, "scsi", &linprocfs_doscsiscsi,
+ NULL, NULL, PFS_RD);
return (0);
}
==== //depot/projects/busdma/compat/linux/linux_file.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.94 2006/03/19 11:10:32 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.95 2006/05/10 20:38:15 netchild Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -63,7 +63,6 @@
#endif
#include <compat/linux/linux_util.h>
-#ifndef __alpha__
int
linux_creat(struct thread *td, struct linux_creat_args *args)
{
@@ -81,7 +80,6 @@
LFREEPATH(path);
return (error);
}
-#endif /*!__alpha__*/
int
linux_open(struct thread *td, struct linux_open_args *args)
@@ -175,7 +173,6 @@
return error;
}
-#ifndef __alpha__
int
linux_llseek(struct thread *td, struct linux_llseek_args *args)
{
@@ -203,9 +200,7 @@
td->td_retval[0] = 0;
return 0;
}
-#endif /*!__alpha__*/
-#ifndef __alpha__
int
linux_readdir(struct thread *td, struct linux_readdir_args *args)
{
@@ -216,7 +211,6 @@
lda.count = 1;
return linux_getdents(td, &lda);
}
-#endif /*!__alpha__*/
/*
* Note that linux_getdents(2) and linux_getdents64(2) have the same
@@ -705,7 +699,6 @@
return (error);
}
-#ifndef __alpha__
int
linux_fdatasync(td, uap)
struct thread *td;
@@ -716,7 +709,6 @@
bsd.fd = uap->fd;
return fsync(td, &bsd);
}
-#endif /*!__alpha__*/
int
linux_pread(td, uap)
@@ -951,10 +943,6 @@
}
#endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */
-#if defined(__alpha__)
-#define linux_fcntl64_args linux_fcntl_args
-#endif
-
static int
fcntl_common(struct thread *td, struct linux_fcntl64_args *args)
{
==== //depot/projects/busdma/compat/linux/linux_ioctl.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.135 2006/03/19 11:10:33 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.136 2006/05/10 20:38:15 netchild Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -276,15 +276,8 @@
unsigned int c_oflag;
unsigned int c_cflag;
unsigned int c_lflag;
-#ifdef __alpha__
- unsigned char c_cc[LINUX_NCCS];
- unsigned char c_line;
- unsigned int c_ispeed;
- unsigned int c_ospeed;
-#else
unsigned char c_line;
unsigned char c_cc[LINUX_NCCS];
-#endif
};
struct linux_winsize {
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list