Date: Fri, 26 Sep 2008 17:23:49 GMT From: Ed Schouten <ed@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 150511 for review Message-ID: <200809261723.m8QHNnnl095524@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=150511 Change 150511 by ed@ed_dull on 2008/09/26 17:23:46 IFC. Affected files ... .. //depot/projects/mpsafetty/crypto/openssh/sshconnect2.c#3 integrate .. //depot/projects/mpsafetty/etc/rc.d/jail#3 integrate .. //depot/projects/mpsafetty/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate .. //depot/projects/mpsafetty/include/Makefile#3 integrate .. //depot/projects/mpsafetty/release/i386/fixit_crunch.conf#2 integrate .. //depot/projects/mpsafetty/release/pc98/fixit-small_crunch.conf#2 integrate .. //depot/projects/mpsafetty/release/pc98/fixit_crunch.conf#2 integrate .. //depot/projects/mpsafetty/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/mpsafetty/share/man/man9/make_dev.9#3 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/mpsafetty/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/dev/dtrace/dtrace_clone.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_proto.h#8 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscall.h#8 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscalls.c#8 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/mpsafetty/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/mpsafetty/sys/ddb/db_command.c#3 integrate .. //depot/projects/mpsafetty/sys/ddb/db_command.h#2 integrate .. //depot/projects/mpsafetty/sys/ddb/db_main.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/mpsafetty/sys/dev/cfe/cfe_api.c#1 branch .. //depot/projects/mpsafetty/sys/dev/cfe/cfe_api.h#1 branch .. //depot/projects/mpsafetty/sys/dev/cfe/cfe_api_int.h#1 branch .. //depot/projects/mpsafetty/sys/dev/cfe/cfe_console.c#1 branch .. //depot/projects/mpsafetty/sys/dev/cfe/cfe_error.h#1 branch .. //depot/projects/mpsafetty/sys/dev/cfe/cfe_ioctl.h#1 branch .. //depot/projects/mpsafetty/sys/dev/cfe/cfe_resource.c#1 branch .. //depot/projects/mpsafetty/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/le/if_le_cbus.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/le/if_le_isa.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/le/if_le_lebuffer.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/le/lebuffer_sbus.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/led/led.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/siba/siba.c#1 branch .. //depot/projects/mpsafetty/sys/dev/siba/siba_ids.h#1 branch .. //depot/projects/mpsafetty/sys/dev/siba/siba_pcib.c#1 branch .. //depot/projects/mpsafetty/sys/dev/siba/siba_pcibvar.h#1 branch .. //depot/projects/mpsafetty/sys/dev/siba/sibareg.h#1 branch .. //depot/projects/mpsafetty/sys/dev/siba/sibavar.h#1 branch .. //depot/projects/mpsafetty/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb/umass.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/xen/blkfront/blkfront.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/xen/netfront/netfront.c#5 integrate .. //depot/projects/mpsafetty/sys/fs/coda/coda_fbsd.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/mpsafetty/sys/geom/geom_dev.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/bios/apm.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/param.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/smp.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/xen/evtchn.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/xen/pmap.c#6 integrate .. //depot/projects/mpsafetty/sys/i386/xen/xen_machdep.c#9 integrate .. //depot/projects/mpsafetty/sys/kern/init_sysent.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/kern_conf.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/kern_synch.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/mpsafetty/sys/kern/subr_witness.c#8 integrate .. //depot/projects/mpsafetty/sys/kern/syscalls.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/syscalls.master#6 integrate .. //depot/projects/mpsafetty/sys/kern/systrace_args.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/mpsafetty/sys/mips/sentry5/s5_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if.c#5 integrate .. //depot/projects/mpsafetty/sys/net/if_stf.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_tap.c#3 integrate .. //depot/projects/mpsafetty/sys/net/if_tun.c#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_ddb.c#5 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_hostap.c#4 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/mpsafetty/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_vnops.c#5 integrate .. //depot/projects/mpsafetty/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/mpsafetty/sys/sys/conf.h#5 integrate .. //depot/projects/mpsafetty/sys/sys/syscall.h#4 integrate .. //depot/projects/mpsafetty/sys/sys/syscall.mk#4 integrate .. //depot/projects/mpsafetty/sys/sys/sysent.h#3 integrate .. //depot/projects/mpsafetty/sys/sys/sysproto.h#4 integrate .. //depot/projects/mpsafetty/sys/sys/tty.h#21 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/mpsafetty/sys/vm/device_pager.c#2 integrate .. //depot/projects/mpsafetty/sys/xen/evtchn/evtchn.c#3 integrate .. //depot/projects/mpsafetty/sys/xen/gnttab.c#3 integrate .. //depot/projects/mpsafetty/sys/xen/gnttab.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/arch-ia64.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/arch-powerpc.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/arch-x86/cpuid.h#1 branch .. //depot/projects/mpsafetty/sys/xen/interface/arch-x86/hvm/save.h#1 branch .. //depot/projects/mpsafetty/sys/xen/interface/arch-x86/xen-mca.h#1 branch .. //depot/projects/mpsafetty/sys/xen/interface/arch-x86/xen-x86_32.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/arch-x86/xen-x86_64.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/arch-x86/xen.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/callback.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/domctl.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/features.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/foreign/mkchecker.py#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/foreign/mkheader.py#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/foreign/structs.py#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/grant_table.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/hvm/hvm_op.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/hvm/ioreq.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/hvm/params.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/hvm/save.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/io/blkif.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/io/fbif.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/io/kbdif.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/io/netif.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/io/pciif.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/io/protocols.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/io/ring.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/io/xenbus.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/io/xs_wire.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/kexec.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/libelf.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/memory.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/physdev.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/platform.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/sysctl.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/trace.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/vcpu.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/xen-compat.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/interface/xen.h#2 integrate .. //depot/projects/mpsafetty/usr.bin/Makefile#5 integrate .. //depot/projects/mpsafetty/usr.sbin/syslogd/syslogd.8#2 integrate .. //depot/projects/mpsafetty/usr.sbin/syslogd/syslogd.c#4 integrate Differences ... ==== //depot/projects/mpsafetty/crypto/openssh/sshconnect2.c#3 (text+ko) ==== @@ -386,8 +386,9 @@ if (options.log_level >= SYSLOG_LEVEL_INFO) { if (len > 65536) len = 65536; - msg = xmalloc(len * 4); /* max expansion from strnvis() */ + msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */ strnvis(msg, raw, len * 4, VIS_SAFE|VIS_OCTAL); + msg[len*4] = '\0'; fprintf(stderr, "%s", msg); xfree(msg); } ==== //depot/projects/mpsafetty/etc/rc.d/jail#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.39 2008/09/16 20:18:25 thompsa Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.40 2008/09/24 15:18:27 ru Exp $ # # PROVIDE: jail @@ -39,6 +39,7 @@ _procdir="${_rootdir}/proc" eval _hostname=\"\$jail_${_j}_hostname\" eval _ip=\"\$jail_${_j}_ip\" + eval _netmask=\"\${jail_${_j}_netmask:-255.255.255.255}\" eval _interface=\"\${jail_${_j}_interface:-${jail_interface}}\" eval _exec=\"\$jail_${_j}_exec\" eval _exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\" @@ -93,6 +94,7 @@ debug "$_j mount enable: $_mount" debug "$_j hostname: $_hostname" debug "$_j ip: $_ip" + debug "$_j netmask: $_netmask" debug "$_j interface: $_interface" debug "$_j fib: $_fib" debug "$_j root: $_rootdir" @@ -297,7 +299,7 @@ continue; fi if [ -n "${_interface}" ]; then - ifconfig ${_interface} alias ${_ip} netmask 255.255.255.255 + ifconfig ${_interface} alias ${_ip} netmask ${_netmask} fi if [ -n "${_fib}" ]; then _setfib="setfib -F '${_fib}'" ==== //depot/projects/mpsafetty/gnu/lib/csu/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.29 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.30 2008/09/26 15:00:18 marcel Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -25,7 +25,7 @@ BEGINSRC= crtbegin.asm ENDSRC= crtend.asm CFLAGS+= -x assembler-with-cpp # Ugly hack -CFLAGS+= -include osreldate.h +CFLAGS+= -D_OSRELDATE_H -include osreldate.h .undef SRCS # hack for 'make depend' .endif .if ${MACHINE_ARCH} == "powerpc" ==== //depot/projects/mpsafetty/gnu/usr.bin/gdb/kgdb/kld.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.9 2008/04/29 20:32:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.10 2008/09/25 19:32:03 jhb Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -37,6 +37,7 @@ #include <command.h> #include <completer.h> #include <environ.h> +#include <exec.h> #include <frame-unwind.h> #include <inferior.h> #include <objfiles.h> @@ -196,39 +197,14 @@ return (0); } -struct add_section_info { - struct section_addr_info *section_addrs; - int sect_index; - CORE_ADDR base_addr; -}; - static void -add_section (bfd *bfd, asection *sect, void *arg) -{ - struct add_section_info *asi = arg; - CORE_ADDR address; - char *name; - - /* Ignore non-resident sections. */ - if ((bfd_get_section_flags(bfd, sect) & (SEC_ALLOC | SEC_LOAD)) == 0) - return; - - name = xstrdup(bfd_get_section_name(bfd, sect)); - make_cleanup(xfree, name); - address = asi->base_addr + bfd_get_section_vma(bfd, sect); - asi->section_addrs->other[asi->sect_index].name = name; - asi->section_addrs->other[asi->sect_index].addr = address; - asi->section_addrs->other[asi->sect_index].sectindex = sect->index; - printf_unfiltered("\t%s_addr = %s\n", name, local_hex_string(address)); - asi->sect_index++; -} - -static void load_kld (char *path, CORE_ADDR base_addr, int from_tty) { - struct add_section_info asi; + struct section_addr_info *sap; + struct section_table *sections, *sections_end, *s; struct cleanup *cleanup; bfd *bfd; + int i; /* Open the kld. */ bfd = bfd_openr(path, gnutarget); @@ -244,19 +220,30 @@ if (bfd_get_section_by_name (bfd, ".text") == NULL) error("\"%s\": can't find text section", path); + /* Build a section table from the bfd and relocate the sections. */ + if (build_section_table (bfd, §ions, §ions_end)) + error("\"%s\": can't find file sections", path); + cleanup = make_cleanup(xfree, sections); + for (s = sections; s < sections_end; s++) { + s->addr += base_addr; + s->endaddr += base_addr; + } + + /* Build a section addr info to pass to symbol_file_add(). */ + sap = build_section_addr_info_from_section_table (sections, + sections_end); + cleanup = make_cleanup((make_cleanup_ftype *)free_section_addr_info, + sap); + printf_unfiltered("add symbol table from file \"%s\" at\n", path); + for (i = 0; i < sap->num_sections; i++) + printf_unfiltered("\t%s_addr = %s\n", sap->other[i].name, + local_hex_string(sap->other[i].addr)); - /* Build a section table for symbol_file_add() from the bfd sections. */ - asi.section_addrs = alloc_section_addr_info(bfd_count_sections(bfd)); - cleanup = make_cleanup(xfree, asi.section_addrs); - asi.sect_index = 0; - asi.base_addr = base_addr; - bfd_map_over_sections(bfd, add_section, &asi); - if (from_tty && (!query("%s", ""))) error("Not confirmed."); - symbol_file_add(path, from_tty, asi.section_addrs, 0, OBJF_USERLOADED); + symbol_file_add(path, from_tty, sap, 0, OBJF_USERLOADED); do_cleanups(cleanup); } ==== //depot/projects/mpsafetty/include/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.281 2008/07/25 12:37:46 ed Exp $ +# $FreeBSD: src/include/Makefile,v 1.282 2008/09/26 05:50:08 peter Exp $ # # Doing a "make install" builds /usr/include. @@ -103,7 +103,16 @@ echo "#else" >> osreldate.h; \ echo "#undef __FreeBSD_version" >> osreldate.h; \ echo "#define __FreeBSD_version $$RELDATE" >> osreldate.h; \ - echo "#endif" >> osreldate.h + echo "#ifdef __STDC__" >> osreldate.h; \ + echo "#ifndef _OSRELDATE_H" >> osreldate.h; \ + echo "#define _OSRELDATE_H" >> osreldate.h; \ + echo "#include <sys/cdefs.h>" >> osreldate.h; \ + echo "__BEGIN_DECLS" >> osreldate.h; \ + echo "extern int getosreldate(void);" >> osreldate.h; \ + echo "__END_DECLS" >> osreldate.h; \ + echo "#endif /* _OSRELDATE_H */" >> osreldate.h; \ + echo "#endif /* __STDC__ */" >> osreldate.h; \ + echo "#endif /* _KERNEL */" >> osreldate.h .for i in ${LHDRS} INCSLINKS+= sys/$i ${INCLUDEDIR}/$i ==== //depot/projects/mpsafetty/release/i386/fixit_crunch.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/i386/fixit_crunch.conf,v 1.16 2007/07/02 14:01:43 kensmith Exp $ +# $FreeBSD: src/release/i386/fixit_crunch.conf,v 1.17 2008/09/25 12:25:54 nyan Exp $ buildopts -DRELEASE_CRUNCH @@ -46,4 +46,4 @@ progs chroot ln chown chgrp -libs -ledit -lgeom -lkiconv -lkvm -lncurses -lutil +libs -ledit -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lutil ==== //depot/projects/mpsafetty/release/pc98/fixit-small_crunch.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.10 2008/05/13 11:51:19 nyan Exp $ +# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.11 2008/09/25 12:25:54 nyan Exp $ buildopts -DRELEASE_CRUNCH @@ -26,7 +26,6 @@ progs clri progs dmesg progs fdisk -progs mknod progs mount progs mount_cd9660 progs mount_msdosfs @@ -37,11 +36,8 @@ special fdisk srcdir /usr/src/sbin/fdisk_pc98 -srcdirs /usr/src/usr.bin -progs ftp - srcdirs /usr/src/usr.sbin progs chown ln chown chgrp -libs -ledit -lgeom -lkiconv -lkvm -lncurses -lutil +libs -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lutil ==== //depot/projects/mpsafetty/release/pc98/fixit_crunch.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/pc98/fixit_crunch.conf,v 1.16 2008/05/11 14:25:24 nyan Exp $ +# $FreeBSD: src/release/pc98/fixit_crunch.conf,v 1.17 2008/09/25 12:25:54 nyan Exp $ buildopts -DRELEASE_CRUNCH @@ -26,7 +26,6 @@ progs clri progs dmesg progs fdisk -progs mknod progs mount progs mount_cd9660 progs mount_msdosfs @@ -45,4 +44,4 @@ progs chown ln chown chgrp -libs -ledit -lgeom -lkiconv -lkvm -lncurses -lutil +libs -ledit -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lutil ==== //depot/projects/mpsafetty/share/man/man5/rc.conf.5#6 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.347 2008/09/19 15:27:37 thompsa Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.349 2008/09/24 21:07:11 des Exp $ .\" -.Dd September 16, 2008 +.Dd September 24, 2008 .Dt RC.CONF 5 .Os .Sh NAME @@ -3116,16 +3116,6 @@ If set to .Dq Li YES , load System V IPC primitives at boot time. -.It Va kernel_symlink_enable -.Pq Vt bool -Set to -.Dq Li YES -to symbolicly link -.Pa /boot/kernel -to the directory that contains the kernel you booted from, -unless -.Pa /boot/kernel -already exists and is not a symbolic link. .It Va clear_tmp_enable .Pq Vt bool Set to @@ -3450,6 +3440,12 @@ Unset by default. When set, sets the interface to use when setting IP address alias. Note that the alias is created at jail startup and removed at jail shutdown. +.It Va jail_ Ns Ao Ar jname Ac Ns Va _netmask +.Pq Vt str +Set to +.Li 255.255.255.255 +by default. +This is the IP netmask to use when setting IP address alias. .It Va jail_ Ns Ao Ar jname Ac Ns Va _fib .Pq Vt str Unset by default. ==== //depot/projects/mpsafetty/share/man/man9/make_dev.9#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/make_dev.9,v 1.24 2008/09/11 11:38:48 kib Exp $ +.\" $FreeBSD: src/share/man/man9/make_dev.9,v 1.25 2008/09/26 14:31:24 ed Exp $ .\" .Dd September 8, 2008 .Os @@ -44,11 +44,11 @@ .In sys/param.h .In sys/conf.h .Ft struct cdev * -.Fn make_dev "struct cdevsw *cdevsw" "int minor" "uid_t uid" "gid_t gid" "int perms" "const char *fmt" ... +.Fn make_dev "struct cdevsw *cdevsw" "int unit" "uid_t uid" "gid_t gid" "int perms" "const char *fmt" ... .Ft struct cdev * -.Fn make_dev_cred "struct cdevsw *cdevsw" "int minor" "struct ucred *cr" "uid_t uid" "gid_t gid" "int perms" "const char *fmt" ... +.Fn make_dev_cred "struct cdevsw *cdevsw" "int unit" "struct ucred *cr" "uid_t uid" "gid_t gid" "int perms" "const char *fmt" ... .Ft struct cdev * -.Fn make_dev_credf "int flags" "struct cdevsw *cdevsw" "int minor" "struct ucred *cr" "uid_t uid" "gid_t gid" "int perms" "const char *fmt" ... +.Fn make_dev_credf "int flags" "struct cdevsw *cdevsw" "int unit" "struct ucred *cr" "uid_t uid" "gid_t gid" "int perms" "const char *fmt" ... .Ft struct cdev * .Fn make_dev_alias "struct cdev *pdev" "const char *fmt" ... .Ft void @@ -148,14 +148,14 @@ .Fn make_dev_cred function is equivalent to the call .Bd -literal -offset indent -make_dev_credf(0, cdevsw, minor, cr, uid, gid, perms, fmt, ...); +make_dev_credf(0, cdevsw, unit, cr, uid, gid, perms, fmt, ...); .Ed . .Pp The .Fn make_dev function call is the same as .Bd -literal -offset indent -make_dev_credf(0, cdevsw, minor, NULL, uid, gid, perms, fmt, ...); +make_dev_credf(0, cdevsw, unit, NULL, uid, gid, perms, fmt, ...); .Ed . .Pp The @@ -184,7 +184,7 @@ Both fields are of type .Ft void * . These are designed to replace the -.Fa minor +.Fa unit argument to .Fn make_dev . .Pp ==== //depot/projects/mpsafetty/sys/cam/scsi/scsi_pass.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.48 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.49 2008/09/26 14:19:52 ed Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -265,7 +265,7 @@ mtx_unlock(periph->sim->mtx); no_tags = (cgd->inq_data.flags & SID_CmdQue) == 0; softc->device_stats = devstat_new_entry("pass", - unit2minor(periph->unit_number), 0, + periph->unit_number, 0, DEVSTAT_NO_BLOCKSIZE | (no_tags ? DEVSTAT_NO_ORDERED_TAGS : 0), softc->pd_type | @@ -274,7 +274,7 @@ DEVSTAT_PRIORITY_PASS); /* Register the device */ - softc->dev = make_dev(&pass_cdevsw, unit2minor(periph->unit_number), + softc->dev = make_dev(&pass_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); mtx_lock(periph->sim->mtx); ==== //depot/projects/mpsafetty/sys/cam/scsi/scsi_ses.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.37 2008/03/17 17:18:16 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.38 2008/09/26 14:19:52 ed Exp $"); #include <sys/param.h> #include <sys/queue.h> @@ -343,7 +343,7 @@ } cam_periph_unlock(periph); - softc->ses_dev = make_dev(&ses_cdevsw, unit2minor(periph->unit_number), + softc->ses_dev = make_dev(&ses_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); cam_periph_lock(periph); ==== //depot/projects/mpsafetty/sys/cam/scsi/scsi_sg.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.9 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.10 2008/09/26 14:19:52 ed Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -287,7 +287,7 @@ cam_periph_unlock(periph); no_tags = (cgd->inq_data.flags & SID_CmdQue) == 0; softc->device_stats = devstat_new_entry("sg", - unit2minor(periph->unit_number), 0, + periph->unit_number, 0, DEVSTAT_NO_BLOCKSIZE | (no_tags ? DEVSTAT_NO_ORDERED_TAGS : 0), softc->pd_type | @@ -296,7 +296,7 @@ DEVSTAT_PRIORITY_PASS); /* Register the device */ - softc->dev = make_dev(&sg_cdevsw, unit2minor(periph->unit_number), + softc->dev = make_dev(&sg_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); (void)make_dev_alias(softc->dev, "sg%c", 'a' + periph->unit_number); ==== //depot/projects/mpsafetty/sys/cam/scsi/scsi_target.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.73 2007/04/15 08:49:11 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.74 2008/09/26 14:19:52 ed Exp $"); #include <sys/param.h> @@ -1031,7 +1031,7 @@ return; if (dev_stdclone(name, NULL, "targ", &u) != 1) return; - *dev = make_dev(&targ_cdevsw, unit2minor(u), UID_ROOT, GID_WHEEL, + *dev = make_dev(&targ_cdevsw, u, UID_ROOT, GID_WHEEL, 0600, "targ%d", u); dev_ref(*dev); (*dev)->si_flags |= SI_CHEAPCLONE; ==== //depot/projects/mpsafetty/sys/cddl/dev/dtrace/dtrace_clone.c#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/cddl/dev/dtrace/dtrace_clone.c,v 1.1 2008/05/23 05:59:41 jb Exp $ + * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_clone.c,v 1.2 2008/09/26 14:19:52 ed Exp $ * */ @@ -52,7 +52,7 @@ /* Clone the device to the new minor number. */ if (clone_create(&dtrace_clones, &dtrace_cdevsw, &u, dev, 0) != 0) /* Create the /dev/dtrace/dtraceNN entry. */ - *dev = make_dev_cred(&dtrace_cdevsw, unit2minor(u), cred, + *dev = make_dev_cred(&dtrace_cdevsw, u, cred, UID_ROOT, GID_WHEEL, 0600, "dtrace/dtrace%d", u); if (*dev != NULL) { dev_ref(*dev); ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_misc.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.79 2008/09/19 15:17:32 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.80 2008/09/25 20:50:21 jhb Exp $"); #include "opt_compat.h" @@ -2624,3 +2624,83 @@ return (error); } #endif + +int +syscall32_register(int *offset, struct sysent *new_sysent, + struct sysent *old_sysent) +{ + if (*offset == NO_SYSCALL) { + int i; + + for (i = 1; i < SYS_MAXSYSCALL; ++i) + if (freebsd32_sysent[i].sy_call == + (sy_call_t *)lkmnosys) + break; + if (i == SYS_MAXSYSCALL) + return (ENFILE); + *offset = i; + } else if (*offset < 0 || *offset >= SYS_MAXSYSCALL) + return (EINVAL); + else if (freebsd32_sysent[*offset].sy_call != (sy_call_t *)lkmnosys && + freebsd32_sysent[*offset].sy_call != (sy_call_t *)lkmressys) + return (EEXIST); + + *old_sysent = freebsd32_sysent[*offset]; + freebsd32_sysent[*offset] = *new_sysent; + return 0; +} + +int +syscall32_deregister(int *offset, struct sysent *old_sysent) +{ + + if (*offset) + freebsd32_sysent[*offset] = *old_sysent; + return 0; +} + +int +syscall32_module_handler(struct module *mod, int what, void *arg) +{ + struct syscall_module_data *data = (struct syscall_module_data*)arg; + modspecific_t ms; + int error; + + switch (what) { + case MOD_LOAD: + error = syscall32_register(data->offset, data->new_sysent, + &data->old_sysent); + if (error) { + /* Leave a mark so we know to safely unload below. */ + data->offset = NULL; + return error; + } + ms.intval = *data->offset; + MOD_XLOCK; + module_setspecific(mod, &ms); + MOD_XUNLOCK; + if (data->chainevh) + error = data->chainevh(mod, what, data->chainarg); + return (error); + case MOD_UNLOAD: + /* + * MOD_LOAD failed, so just return without calling the + * chained handler since we didn't pass along the MOD_LOAD + * event. + */ + if (data->offset == NULL) + return (0); + if (data->chainevh) { + error = data->chainevh(mod, what, data->chainarg); + if (error) + return (error); + } + error = syscall_deregister(data->offset, &data->old_sysent); + return (error); + default: + error = EOPNOTSUPP; + if (data->chainevh) + error = data->chainevh(mod, what, data->chainarg); + return (error); + } +} ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_proto.h#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.92 2008/09/22 16:09:43 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.93 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscall.h#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.91 2008/09/22 16:09:43 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.92 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscalls.c#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.82 2008/09/22 16:09:43 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.83 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ const char *freebsd32_syscallnames[] = { @@ -217,16 +217,16 @@ "getpgid", /* 207 = getpgid */ "#208", /* 208 = newreboot */ "poll", /* 209 = poll */ - "#210", /* 210 = */ - "#211", /* 211 = */ - "#212", /* 212 = */ - "#213", /* 213 = */ - "#214", /* 214 = */ - "#215", /* 215 = */ - "#216", /* 216 = */ - "#217", /* 217 = */ - "#218", /* 218 = */ - "#219", /* 219 = */ + "lkmnosys", /* 210 = lkmnosys */ + "lkmnosys", /* 211 = lkmnosys */ + "lkmnosys", /* 212 = lkmnosys */ + "lkmnosys", /* 213 = lkmnosys */ + "lkmnosys", /* 214 = lkmnosys */ + "lkmnosys", /* 215 = lkmnosys */ + "lkmnosys", /* 216 = lkmnosys */ + "lkmnosys", /* 217 = lkmnosys */ + "lkmnosys", /* 218 = lkmnosys */ + "lkmnosys", /* 219 = lkmnosys */ "freebsd32_semctl", /* 220 = freebsd32_semctl */ "semget", /* 221 = semget */ "semop", /* 222 = semop */ @@ -377,7 +377,7 @@ "#367", /* 367 = __cap_get_file */ "#368", /* 368 = __cap_set_fd */ "#369", /* 369 = __cap_set_file */ - "#370", /* 370 = lkmressys */ + "#370", /* 370 = nosys */ "extattr_set_fd", /* 371 = extattr_set_fd */ "extattr_get_fd", /* 372 = extattr_get_fd */ "extattr_delete_fd", /* 373 = extattr_delete_fd */ ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_sysent.c#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.92 2008/09/22 16:09:43 obrien Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183270 2008-09-22 16:09:16Z obrien + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.93 2008/09/25 20:08:36 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb */ #include "opt_compat.h" @@ -248,16 +248,16 @@ { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0 }, /* 207 = getpgid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 208 = newreboot */ { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0 }, /* 209 = poll */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 210 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 211 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 212 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 213 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 214 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 215 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 216 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 217 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 218 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 219 = */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 210 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 211 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 212 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 213 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 214 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 215 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 216 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 217 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 218 = lkmnosys */ + { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0 }, /* 219 = lkmnosys */ { AS(freebsd32_semctl_args), (sy_call_t *)freebsd32_semctl, AUE_SEMCTL, NULL, 0, 0 }, /* 220 = freebsd32_semctl */ { AS(semget_args), (sy_call_t *)semget, AUE_SEMGET, NULL, 0, 0 }, /* 221 = semget */ { AS(semop_args), (sy_call_t *)semop, AUE_SEMOP, NULL, 0, 0 }, /* 222 = semop */ @@ -408,7 +408,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 367 = __cap_get_file */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 368 = __cap_set_fd */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 369 = __cap_set_file */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 370 = lkmressys */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 370 = nosys */ { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0 }, /* 371 = extattr_set_fd */ { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0 }, /* 372 = extattr_get_fd */ { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0 }, /* 373 = extattr_delete_fd */ ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_util.h#2 (text+ko) ==== @@ -25,18 +25,20 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_util.h,v 1.10 2005/06/29 15:16:20 jhb Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_util.h,v 1.12 2008/09/25 20:50:21 jhb Exp $ */ +#ifndef _COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ +#define _COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ + +#include <sys/cdefs.h> +#include <sys/exec.h> +#include <sys/sysent.h> + #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/pmap.h> - -#include <sys/exec.h> -#include <sys/sysent.h> -#include <sys/cdefs.h> - struct freebsd32_ps_strings { u_int32_t ps_argvstr; /* first of 0 or more argument strings */ int ps_nargvstr; /* the number of argument strings */ @@ -50,3 +52,35 @@ #define FREEBSD32_PS_STRINGS \ (FREEBSD32_USRSTACK - sizeof(struct freebsd32_ps_strings)) + +extern struct sysent freebsd32_sysent[]; + +#define SYSCALL32_MODULE(name, offset, new_sysent, evh, arg) \ +static struct syscall_module_data name##_syscall32_mod = { \ + evh, arg, offset, new_sysent, { 0, NULL } \ +}; \ + \ +static moduledata_t name##32_mod = { \ + #name, \ + syscall32_module_handler, \ + &name##_syscall32_mod \ +}; \ +DECLARE_MODULE(name##32, name##32_mod, SI_SUB_SYSCALLS, SI_ORDER_MIDDLE) + +#define SYSCALL32_MODULE_HELPER(syscallname) \ +static int syscallname##_syscall32 = FREEBSD32_SYS_##syscallname; \ +static struct sysent syscallname##_sysent32 = { \ + (sizeof(struct syscallname ## _args ) \ + / sizeof(register_t)), \ + (sy_call_t *)& syscallname \ +}; \ +SYSCALL32_MODULE(syscallname, \ + & syscallname##_syscall32, & syscallname##_sysent32,\ + NULL, NULL); + +int syscall32_register(int *offset, struct sysent *new_sysent, + struct sysent *old_sysent); +int syscall32_deregister(int *offset, struct sysent *old_sysent); +int syscall32_module_handler(struct module *mod, int what, void *arg); + +#endif /* !_COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ */ ==== //depot/projects/mpsafetty/sys/compat/freebsd32/syscalls.master#9 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.107 2008/09/22 16:09:16 obrien Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.108 2008/09/25 20:07:42 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -33,7 +33,7 @@ ; so the SYSCALL_MODULE macro works ; NOARGS same as STD except do not create structure in sys/sysproto.h ; NODEF same as STD except only have the entry in the syscall table -; added. Meaning - do do not create structure or function +; added. Meaning - do not create structure or function ; prototype in sys/sysproto.h ; NOPROTO same as STD except do not create structure or ; function prototype in sys/sysproto.h. Does add a @@ -388,16 +388,16 @@ ; ; The following are reserved for loadable syscalls ; -210 AUE_NULL UNIMPL -211 AUE_NULL UNIMPL -212 AUE_NULL UNIMPL -213 AUE_NULL UNIMPL -214 AUE_NULL UNIMPL -215 AUE_NULL UNIMPL -216 AUE_NULL UNIMPL -217 AUE_NULL UNIMPL -218 AUE_NULL UNIMPL -219 AUE_NULL UNIMPL +210 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +211 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +212 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +213 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +214 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +215 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +216 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +217 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +218 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int +219 AUE_NULL NODEF lkmnosys lkmnosys nosys_args int ; ; The following were introduced with NetBSD/4.4Lite-2 @@ -637,7 +637,7 @@ 367 AUE_NULL UNIMPL __cap_get_file 368 AUE_NULL UNIMPL __cap_set_fd 369 AUE_NULL UNIMPL __cap_set_file -370 AUE_NULL UNIMPL lkmressys +370 AUE_NULL UNIMPL nosys 371 AUE_EXTATTR_SET_FD NOPROTO { int extattr_set_fd(int fd, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } ==== //depot/projects/mpsafetty/sys/compat/ia32/ia32_sysvec.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.28 2008/09/24 10:14:37 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.29 2008/09/25 20:50:21 jhb Exp $"); #include "opt_compat.h" @@ -96,8 +96,6 @@ static register_t *ia32_copyout_strings(struct image_params *imgp); static void ia32_fixlimit(struct rlimit *rl, int which); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809261723.m8QHNnnl095524>