Date: Thu, 9 Nov 2006 20:07:16 GMT From: Alex Lyashkov <als@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 109637 for review Message-ID: <200611092007.kA9K7GMw080558@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=109637 Change 109637 by als@als_head on 2006/11/09 20:06:49 merge last priv(9) changes. it`s only have compile test. more testing planing at weekend. Affected files ... .. //depot/projects/jail2/sys/amd64/amd64/io.c#2 integrate .. //depot/projects/jail2/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/jail2/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux.h#4 integrate .. //depot/projects/jail2/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/jail2/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/jail2/sys/arm/arm/intr.c#2 integrate .. //depot/projects/jail2/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/jail2/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/jail2/sys/arm/include/armreg.h#3 integrate .. //depot/projects/jail2/sys/arm/include/atomic.h#2 integrate .. //depot/projects/jail2/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/jail2/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/jail2/sys/arm/include/pmap.h#3 integrate .. //depot/projects/jail2/sys/boot/Makefile#5 integrate .. //depot/projects/jail2/sys/boot/efi/include/efilib.h#3 integrate .. //depot/projects/jail2/sys/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/jail2/sys/boot/efi/libefi/bootinfo.c#2 delete .. //depot/projects/jail2/sys/boot/efi/libefi/copy.c#2 delete .. //depot/projects/jail2/sys/boot/efi/libefi/devicename.c#3 delete .. //depot/projects/jail2/sys/boot/efi/libefi/efiboot.h#3 delete .. //depot/projects/jail2/sys/boot/efi/libefi/efifpswa.c#2 delete .. //depot/projects/jail2/sys/boot/efi/libefi/efifs.c#3 integrate .. //depot/projects/jail2/sys/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/jail2/sys/boot/efi/libefi/elf_freebsd.c#2 delete .. //depot/projects/jail2/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/jail2/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/jail2/sys/boot/efi/libefi/module.c#2 delete .. //depot/projects/jail2/sys/boot/efi/libefi/time.c#2 integrate .. //depot/projects/jail2/sys/boot/ia64/Makefile#2 integrate .. //depot/projects/jail2/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/jail2/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/jail2/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/jail2/sys/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/jail2/sys/boot/ia64/efi/efimd.c#2 integrate .. //depot/projects/jail2/sys/boot/ia64/efi/main.c#3 integrate .. //depot/projects/jail2/sys/boot/ia64/efi/version#2 integrate .. //depot/projects/jail2/sys/boot/ia64/ski/Makefile#2 integrate .. //depot/projects/jail2/sys/boot/ia64/ski/bootinfo.c#2 delete .. //depot/projects/jail2/sys/boot/ia64/ski/copy.c#2 delete .. //depot/projects/jail2/sys/boot/ia64/ski/devicename.c#3 delete .. //depot/projects/jail2/sys/boot/ia64/ski/efi_stub.c#2 integrate .. //depot/projects/jail2/sys/boot/ia64/ski/elf_freebsd.c#2 delete .. //depot/projects/jail2/sys/boot/ia64/ski/libski.h#3 integrate .. //depot/projects/jail2/sys/boot/ia64/ski/main.c#3 integrate .. //depot/projects/jail2/sys/boot/ia64/ski/skifs.c#2 integrate .. //depot/projects/jail2/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/jail2/sys/boot/ia64/ski/version#2 integrate .. //depot/projects/jail2/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/jail2/sys/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/jail2/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/jail2/sys/compat/linux/linux_misc.c#8 integrate .. //depot/projects/jail2/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/jail2/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/jail2/sys/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/jail2/sys/conf/files#8 integrate .. //depot/projects/jail2/sys/conf/files.arm#3 integrate .. //depot/projects/jail2/sys/conf/files.sun4v#3 integrate .. //depot/projects/jail2/sys/contrib/altq/altq/altq_cbq.c#2 integrate .. //depot/projects/jail2/sys/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/jail2/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/jail2/sys/contrib/altq/altq/altq_priq.c#2 integrate .. //depot/projects/jail2/sys/contrib/altq/altq/altq_red.c#2 integrate .. //depot/projects/jail2/sys/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/jail2/sys/contrib/pf/net/if_pfsync.c#4 integrate .. //depot/projects/jail2/sys/ddb/db_main.c#2 integrate .. //depot/projects/jail2/sys/dev/acpi_support/acpi_aiboost.c#2 integrate .. //depot/projects/jail2/sys/dev/aha/ahareg.h#2 integrate .. //depot/projects/jail2/sys/dev/an/if_an.c#2 integrate .. //depot/projects/jail2/sys/dev/arl/if_arl.c#2 integrate .. //depot/projects/jail2/sys/dev/asr/asr.c#3 integrate .. //depot/projects/jail2/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/jail2/sys/dev/ce/if_ce.c#2 integrate .. //depot/projects/jail2/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/jail2/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/jail2/sys/dev/ctau/if_ct.c#2 integrate .. //depot/projects/jail2/sys/dev/cx/if_cx.c#2 integrate .. //depot/projects/jail2/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/jail2/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/jail2/sys/dev/em/if_em.c#8 integrate .. //depot/projects/jail2/sys/dev/em/if_em.h#5 integrate .. //depot/projects/jail2/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/jail2/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/jail2/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/jail2/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/jail2/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/jail2/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/jail2/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/jail2/sys/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/jail2/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/jail2/sys/dev/null/null.c#2 integrate .. //depot/projects/jail2/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/jail2/sys/dev/pci/pci.c#5 integrate .. //depot/projects/jail2/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/jail2/sys/dev/pci/pcib_if.m#2 integrate .. //depot/projects/jail2/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/jail2/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/jail2/sys/dev/sbsh/if_sbsh.c#2 integrate .. //depot/projects/jail2/sys/dev/si/si.c#2 integrate .. //depot/projects/jail2/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/jail2/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/jail2/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/jail2/sys/dev/wl/if_wl.c#3 integrate .. //depot/projects/jail2/sys/dev/zs/zs.c#2 integrate .. //depot/projects/jail2/sys/fs/devfs/devfs_rule.c#3 integrate .. //depot/projects/jail2/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/jail2/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/jail2/sys/fs/procfs/procfs_ioctl.c#3 integrate .. //depot/projects/jail2/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/jail2/sys/fs/smbfs/smbfs_smb.c#2 integrate .. //depot/projects/jail2/sys/fs/smbfs/smbfs_vnops.c#2 integrate .. //depot/projects/jail2/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/jail2/sys/fs/umapfs/umap_vfsops.c#3 integrate .. //depot/projects/jail2/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/jail2/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/jail2/sys/gnu/fs/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/jail2/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/jail2/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/jail2/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/jail2/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/jail2/sys/i386/i386/io.c#2 integrate .. //depot/projects/jail2/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/jail2/sys/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/jail2/sys/i386/i386/vm86.c#2 integrate .. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_misc.c#4 integrate .. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_socksys.c#3 integrate .. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_sysi86.c#2 integrate .. //depot/projects/jail2/sys/i386/linux/linux_machdep.c#6 integrate .. //depot/projects/jail2/sys/i4b/driver/i4b_ipr.c#2 integrate .. //depot/projects/jail2/sys/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/jail2/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/jail2/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_acct.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/jail2/sys/kern/kern_environment.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_exec.c#6 integrate .. //depot/projects/jail2/sys/kern/kern_fork.c#5 integrate .. //depot/projects/jail2/sys/kern/kern_jail.c#10 edit .. //depot/projects/jail2/sys/kern/kern_ktrace.c#5 integrate .. //depot/projects/jail2/sys/kern/kern_linker.c#8 integrate .. //depot/projects/jail2/sys/kern/kern_ntptime.c#2 integrate .. //depot/projects/jail2/sys/kern/kern_priv.c#1 branch .. //depot/projects/jail2/sys/kern/kern_prot.c#6 integrate .. //depot/projects/jail2/sys/kern/kern_resource.c#6 integrate .. //depot/projects/jail2/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_thr.c#6 integrate .. //depot/projects/jail2/sys/kern/kern_time.c#5 integrate .. //depot/projects/jail2/sys/kern/kern_umtx.c#7 integrate .. //depot/projects/jail2/sys/kern/kern_xxx.c#2 integrate .. //depot/projects/jail2/sys/kern/sched_ule.c#4 integrate .. //depot/projects/jail2/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/jail2/sys/kern/subr_firmware.c#3 integrate .. //depot/projects/jail2/sys/kern/subr_prf.c#5 integrate .. //depot/projects/jail2/sys/kern/subr_witness.c#4 integrate .. //depot/projects/jail2/sys/kern/sysv_ipc.c#3 integrate .. //depot/projects/jail2/sys/kern/sysv_msg.c#5 integrate .. //depot/projects/jail2/sys/kern/tty.c#7 integrate .. //depot/projects/jail2/sys/kern/tty_cons.c#3 integrate .. //depot/projects/jail2/sys/kern/tty_pts.c#4 integrate .. //depot/projects/jail2/sys/kern/tty_pty.c#4 integrate .. //depot/projects/jail2/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/jail2/sys/kern/uipc_sem.c#5 integrate .. //depot/projects/jail2/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/jail2/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/jail2/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/jail2/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/jail2/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/jail2/sys/net/bpf.c#4 integrate .. //depot/projects/jail2/sys/net/if.c#7 integrate .. //depot/projects/jail2/sys/net/if_bridge.c#8 integrate .. //depot/projects/jail2/sys/net/if_bridgevar.h#4 integrate .. //depot/projects/jail2/sys/net/if_gre.c#3 integrate .. //depot/projects/jail2/sys/net/if_ppp.c#4 integrate .. //depot/projects/jail2/sys/net/if_sl.c#2 integrate .. //depot/projects/jail2/sys/net/if_tap.c#5 integrate .. //depot/projects/jail2/sys/net/if_tun.c#4 integrate .. //depot/projects/jail2/sys/net/ppp_tty.c#3 integrate .. //depot/projects/jail2/sys/net/raw_usrreq.c#3 integrate .. //depot/projects/jail2/sys/net/rtsock.c#5 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/jail2/sys/netatalk/at_control.c#2 integrate .. //depot/projects/jail2/sys/netatalk/ddp_pcb.c#3 integrate .. //depot/projects/jail2/sys/netatm/atm_usrreq.c#3 integrate .. //depot/projects/jail2/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/jail2/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate .. //depot/projects/jail2/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/jail2/sys/netgraph/ng_socket.c#4 integrate .. //depot/projects/jail2/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/jail2/sys/netinet/in.c#3 integrate .. //depot/projects/jail2/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/jail2/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/jail2/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/jail2/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/jail2/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/jail2/sys/netinet/ip_output.c#6 integrate .. //depot/projects/jail2/sys/netinet/libalias/alias_smedia.c#3 integrate .. //depot/projects/jail2/sys/netinet/raw_ip.c#6 integrate .. //depot/projects/jail2/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_crc32.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctputil.c#2 integrate .. //depot/projects/jail2/sys/netinet/sctputil.h#2 integrate .. //depot/projects/jail2/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/jail2/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/jail2/sys/netinet6/in6.c#5 integrate .. //depot/projects/jail2/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/jail2/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/jail2/sys/netinet6/ipsec.c#3 integrate .. //depot/projects/jail2/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/jail2/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/jail2/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/jail2/sys/netipsec/ipsec_osdep.h#3 integrate .. //depot/projects/jail2/sys/netipx/ipx_pcb.c#2 integrate .. //depot/projects/jail2/sys/netipx/ipx_usrreq.c#3 integrate .. //depot/projects/jail2/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/jail2/sys/netncp/ncp_mod.c#2 integrate .. //depot/projects/jail2/sys/netncp/ncp_subr.h#2 integrate .. //depot/projects/jail2/sys/netsmb/smb_conn.c#3 integrate .. //depot/projects/jail2/sys/netsmb/smb_subr.c#2 integrate .. //depot/projects/jail2/sys/netsmb/smb_subr.h#2 integrate .. //depot/projects/jail2/sys/nfsclient/bootp_subr.c#4 integrate .. //depot/projects/jail2/sys/nfsserver/nfs_syscalls.c#4 integrate .. //depot/projects/jail2/sys/pc98/cbus/fdc.c#3 integrate .. //depot/projects/jail2/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/jail2/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/jail2/sys/pci/if_pcn.c#2 integrate .. //depot/projects/jail2/sys/pci/if_pcnreg.h#2 integrate .. //depot/projects/jail2/sys/posix4/p1003_1b.c#3 integrate .. //depot/projects/jail2/sys/powerpc/conf/DEFAULTS#3 integrate .. //depot/projects/jail2/sys/security/audit/audit.c#4 integrate .. //depot/projects/jail2/sys/security/audit/audit_arg.c#4 integrate .. //depot/projects/jail2/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/jail2/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/jail2/sys/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/jail2/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/jail2/sys/security/mac/mac_internal.h#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_net.c#4 integrate .. //depot/projects/jail2/sys/security/mac/mac_priv.c#1 branch .. //depot/projects/jail2/sys/security/mac/mac_system.c#3 integrate .. //depot/projects/jail2/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/jail2/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/jail2/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/jail2/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/jail2/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/jail2/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/jail2/sys/sparc64/conf/DEFAULTS#3 integrate .. //depot/projects/jail2/sys/sun4v/conf/DEFAULTS#3 integrate .. //depot/projects/jail2/sys/sun4v/conf/GENERIC#3 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/hcall.S#3 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/interrupt.S#2 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/intr_machdep.c#2 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/support.S#3 integrate .. //depot/projects/jail2/sys/sys/jail.h#7 integrate .. //depot/projects/jail2/sys/sys/mac_policy.h#5 integrate .. //depot/projects/jail2/sys/sys/priv.h#1 branch .. //depot/projects/jail2/sys/sys/sem.h#3 integrate .. //depot/projects/jail2/sys/sys/systm.h#7 integrate .. //depot/projects/jail2/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/jail2/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/jail2/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/jail2/sys/ufs/ufs/ufs_extattr.c#2 integrate .. //depot/projects/jail2/sys/ufs/ufs/ufs_quota.c#4 integrate .. //depot/projects/jail2/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/jail2/sys/vm/swap_pager.c#4 integrate .. //depot/projects/jail2/sys/vm/vm_contig.c#5 integrate .. //depot/projects/jail2/sys/vm/vm_mmap.c#4 integrate .. //depot/projects/jail2/sys/vm/vm_page.c#7 integrate Differences ... ==== //depot/projects/jail2/sys/amd64/amd64/io.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.1 2004/08/01 11:40:50 markm Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.2 2006/11/06 13:41:49 rwatson Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -33,6 +33,7 @@ #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mutex.h> +#include <sys/priv.h> #include <sys/proc.h> #include <sys/signalvar.h> #include <sys/systm.h> @@ -54,7 +55,7 @@ { int error; - error = suser(td); + error = priv_check(td, PRIV_IO); if (error != 0) return (error); error = securelevel_gt(td->td_ucred, 0); ==== //depot/projects/jail2/sys/amd64/amd64/machdep.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.657 2006/10/26 21:42:16 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.660 2006/11/07 21:57:18 ru Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -196,7 +196,7 @@ #ifdef PERFMON perfmon_init(); #endif - printf("usable memory = %ju (%ju MB)\n", ptoa((uintmax_t)physmem), + printf("usable memory = %ju (%ju MB)\n", ptoa((uintmax_t)physmem), ptoa((uintmax_t)physmem) / 1048576); realmem = Maxmem; /* @@ -220,7 +220,7 @@ vm_ksubmap_init(&kmi); - printf("avail memory = %ju (%ju MB)\n", + printf("avail memory = %ju (%ju MB)\n", ptoa((uintmax_t)cnt.v_free_count), ptoa((uintmax_t)cnt.v_free_count) / 1048576); @@ -747,8 +747,6 @@ ip->gd_hioffset = ((uintptr_t)func)>>16 ; } -#define IDTVEC(name) __CONCAT(X,name) - extern inthand_t IDTVEC(div), IDTVEC(dbg), IDTVEC(nmi), IDTVEC(bpt), IDTVEC(ofl), IDTVEC(bnd), IDTVEC(ill), IDTVEC(dna), IDTVEC(fpusegm), @@ -877,7 +875,7 @@ if (smap->base < physmap[i + 1]) { if (boothowto & RB_VERBOSE) printf( - "Overlapping or non-montonic memory region, ignoring second region\n"); + "Overlapping or non-monotonic memory region, ignoring second region\n"); continue; } } ==== //depot/projects/jail2/sys/amd64/conf/DEFAULTS#3 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.8 2006/11/04 04:58:09 jb Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.9 2006/11/04 23:50:11 jb Exp $ machine amd64 @@ -17,6 +17,3 @@ # KSE support went from being default to a kernel option options KSE - -# Kernel support for loading DTrace modules -options KDTRACE ==== //depot/projects/jail2/sys/amd64/linux32/linux.h#4 (text+ko) ==== @@ -27,14 +27,12 @@ * (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/amd64/linux32/linux.h,v 1.8 2006/10/29 14:02:38 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.9 2006/11/07 18:53:49 jhb Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ #define _AMD64_LINUX_LINUX_H_ -#include <sys/signal.h> /* for sigval union */ - #include <amd64/linux32/linux32_syscall.h> /* @@ -379,6 +377,11 @@ #define LINUX_SI_MAX_SIZE 128 #define LINUX_SI_PAD_SIZE ((LINUX_SI_MAX_SIZE/sizeof(l_int)) - 3) +union l_sigval { + l_int sival_int; + l_uintptr_t sival_ptr; +}; + typedef struct l_siginfo { l_int lsi_signo; l_int lsi_errno; @@ -399,7 +402,7 @@ struct { l_pid_t _pid; /* sender's pid */ l_uid16_t _uid; /* sender's uid */ - union sigval _sigval; + union l_sigval _sigval; } __packed _rt; struct { ==== //depot/projects/jail2/sys/arm/arm/cpufunc.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.12 2006/10/21 04:25:00 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.13 2006/11/07 22:36:56 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -73,13 +73,17 @@ #include <arm/xscale/i80321/i80321var.h> #endif +#if defined(CPU_XSCALE_81342) +#include <arm/xscale/i8134x/i81342reg.h> +#endif + #ifdef CPU_XSCALE_IXP425 #include <arm/xscale/ixp425/ixp425reg.h> #include <arm/xscale/ixp425/ixp425var.h> #endif #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) #include <arm/xscale/xscalereg.h> #endif @@ -570,6 +574,62 @@ /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 CPU_XSCALE_80219 */ +#ifdef CPU_XSCALE_81342 +struct cpu_functions xscalec3_cpufuncs = { + /* CPU functions */ + + cpufunc_id, /* id */ + xscale_cpwait, /* cpwait */ + + /* MMU functions */ + + xscale_control, /* control */ + cpufunc_domains, /* domain */ + xscalec3_setttb, /* setttb */ + cpufunc_faultstatus, /* faultstatus */ + cpufunc_faultaddress, /* faultaddress */ + + /* TLB functions */ + + armv4_tlb_flushID, /* tlb_flushID */ + xscale_tlb_flushID_SE, /* tlb_flushID_SE */ + armv4_tlb_flushI, /* tlb_flushI */ + (void *)armv4_tlb_flushI, /* tlb_flushI_SE */ + armv4_tlb_flushD, /* tlb_flushD */ + armv4_tlb_flushD_SE, /* tlb_flushD_SE */ + + /* Cache operations */ + + xscalec3_cache_syncI, /* icache_sync_all */ + xscale_cache_syncI_rng, /* icache_sync_range */ + + xscalec3_cache_purgeD, /* dcache_wbinv_all */ + xscalec3_cache_purgeD_rng, /* dcache_wbinv_range */ + xscale_cache_flushD_rng, /* dcache_inv_range */ + xscalec3_cache_cleanD_rng, /* dcache_wb_range */ + + xscalec3_cache_purgeID, /* idcache_wbinv_all */ + xscalec3_cache_purgeID_rng, /* idcache_wbinv_range */ + + /* Other functions */ + + cpufunc_nullop, /* flush_prefetchbuf */ + armv4_drain_writebuf, /* drain_writebuf */ + cpufunc_nullop, /* flush_brnchtgt_C */ + (void *)cpufunc_nullop, /* flush_brnchtgt_E */ + + xscale_cpu_sleep, /* sleep */ + + /* Soft functions */ + + cpufunc_null_fixup, /* dataabt_fixup */ + cpufunc_null_fixup, /* prefetchabt_fixup */ + + xscalec3_context_switch, /* context_switch */ + + xscale_setup /* cpu setup */ +}; +#endif /* CPU_XSCALE_81342 */ /* * Global constants also used by locore.s */ @@ -582,7 +642,7 @@ defined (CPU_ARM10) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) static void get_cachetype_cp15(void); @@ -895,7 +955,6 @@ if (cputype == CPU_ID_80321_400 || cputype == CPU_ID_80321_600 || cputype == CPU_ID_80321_400_B0 || cputype == CPU_ID_80321_600_B0 || cputype == CPU_ID_80219_400 || cputype == CPU_ID_80219_600) { - /* * Reset the Performance Monitoring Unit to a * pristine state: @@ -920,6 +979,19 @@ } #endif /* CPU_XSCALE_80321 */ +#if defined(CPU_XSCALE_81342) + if (cputype == CPU_ID_81342) { + cpufuncs = xscalec3_cpufuncs; +#if defined(PERFCTRS) + xscale_pmu_init(); +#endif + + cpu_reset_needs_v4_MMU_disable = 1; /* XScale needs it */ + get_cachetype_cp15(); + pmap_pte_init_xscale(); + return 0; + } +#endif /* CPU_XSCALE_81342 */ #ifdef CPU_XSCALE_PXA2X0 /* ignore core revision to test PXA2xx CPUs */ if ((cputype & ~CPU_ID_XSCALE_COREREV_MASK) == CPU_ID_PXA250 || @@ -1326,7 +1398,7 @@ defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) #define IGN 0 #define OR 1 @@ -1794,7 +1866,7 @@ #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) struct cpu_option xscale_options[] = { #ifdef COMPAT_12 { "branchpredict", BIC, OR, CPU_CONTROL_BPRD_ENABLE }, ==== //depot/projects/jail2/sys/arm/arm/identcpu.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.8 2006/08/24 23:51:27 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.9 2006/11/07 22:36:57 cognet Exp $"); #include <sys/systm.h> #include <sys/param.h> #include <sys/malloc.h> @@ -126,6 +126,13 @@ "rev 12", "rev 13", "rev 14", "rev 15", }; +static const char * const i81342_steppings[16] = { + "step A-0", "rev 1", "rev 2", "rev 3", + "rev 4", "rev 5", "rev 6", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + static const char * const pxa2x0_steppings[16] = { "step A-0", "step A-1", "step B-0", "step B-1", "step B-2", "step C-0", "rev 6", "rev 7", @@ -229,6 +236,9 @@ { CPU_ID_80321_600_B0, CPU_CLASS_XSCALE, "i80321 600MHz", i80321_steppings }, + { CPU_ID_81342, CPU_CLASS_XSCALE, "i81342", + i81342_steppings }, + { CPU_ID_80219_400, CPU_CLASS_XSCALE, "i80219 400MHz", xscale_steppings }, ==== //depot/projects/jail2/sys/arm/arm/intr.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.12 2005/12/22 22:16:06 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.13 2006/11/08 01:32:24 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/syslog.h> @@ -106,6 +106,7 @@ struct thread *td = curthread; int i, thread; + PCPU_LAZY_INC(cnt.v_intr); td->td_intr_nesting_level++; while ((i = arm_get_next_irq()) != -1) { arm_mask_irq(i); ==== //depot/projects/jail2/sys/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.69 2006/08/28 21:43:34 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.71 2006/11/08 06:31:28 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -278,6 +278,8 @@ extern void bcopy_page(vm_offset_t, vm_offset_t); extern void bzero_page(vm_offset_t); +extern vm_offset_t alloc_firstaddr; + char *_tmppt; /* @@ -1960,7 +1962,7 @@ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + vm_page_array_size; + pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; pv_entry_high_water = 9 * (pv_entry_max / 10); l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); @@ -2784,6 +2786,11 @@ KASSERT(l2b != NULL, ("No L2 bucket in pmap_remove_pages")); pt = &l2b->l2b_kva[l2pte_index(pv->pv_va)]; m = PHYS_TO_VM_PAGE(*pt & L2_ADDR_MASK); +#ifdef ARM_USE_SMALL_ALLOC + KASSERT((vm_offset_t)m >= alloc_firstaddr, ("Trying to access non-existent page va %x pte %x", pv->pv_va, *pt)); +#else + KASSERT((vm_offset_t)m >= KERNBASE, ("Trying to access non-existent page va %x pte %x", pv->pv_va, *pt)); +#endif *pt = 0; PTE_SYNC(pt); npv = TAILQ_NEXT(pv, pv_plist); @@ -4563,7 +4570,7 @@ /* * pmap_link_l2pt: * - * Link the L2 page table specified by "pa" into the L1 + * Link the L2 page table specified by l2pv.pv_pa into the L1 * page table at the slot for "va". */ void @@ -4574,7 +4581,12 @@ proto = L1_S_DOM(PMAP_DOMAIN_KERNEL) | L1_C_PROTO; +#ifdef VERBOSE_INIT_ARM + printf("pmap_link_l2pt: pa=0x%x va=0x%x\n", l2pv->pv_pa, l2pv->pv_va); +#endif + pde[slot + 0] = proto | (l2pv->pv_pa + 0x000); + PTE_SYNC(&pde[slot]); SLIST_INSERT_HEAD(&kernel_pt_list, l2pv, pv_list); ==== //depot/projects/jail2/sys/arm/arm/vm_machdep.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.28 2006/10/24 23:27:52 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.29 2006/11/07 22:35:30 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -456,7 +456,7 @@ MALLOC_DEFINE(M_VMSMALLALLOC, "vm_small_alloc", "VM Small alloc data"); -static vm_offset_t alloc_firstaddr; +vm_offset_t alloc_firstaddr; vm_offset_t arm_ptovirt(vm_paddr_t pa) ==== //depot/projects/jail2/sys/arm/include/armreg.h#3 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/armreg.h,v 1.4 2006/08/24 23:51:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/armreg.h,v 1.5 2006/11/07 22:36:56 cognet Exp $ */ #ifndef MACHINE_ARMREG_H @@ -157,6 +157,7 @@ #define CPU_ID_80321_600_B0 0x69052c30 #define CPU_ID_80219_400 0x69052e20 /* A0 stepping/revision. */ #define CPU_ID_80219_600 0x69052e30 /* A0 stepping/revision. */ +#define CPU_ID_81342 0x69056810 #define CPU_ID_IXP425_533 0x690541c0 #define CPU_ID_IXP425_400 0x690541d0 #define CPU_ID_IXP425_266 0x690541f0 ==== //depot/projects/jail2/sys/arm/include/atomic.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.19 2006/05/15 13:08:12 cognet Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.20 2006/11/07 11:53:44 cognet Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -337,6 +337,7 @@ #define atomic_cmpset_acq_int atomic_cmpset_32 #define atomic_cmpset_acq_ptr atomic_cmpset_ptr #define atomic_cmpset_acq_long atomic_cmpset_long +#define atomic_cmpset_acq_32 atomic_cmpset_32 #define atomic_store_rel_ptr atomic_store_ptr #define atomic_store_rel_int atomic_store_32 #define atomic_cmpset_rel_32 atomic_cmpset_32 ==== //depot/projects/jail2/sys/arm/include/cpuconf.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.8 2006/08/24 23:51:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.9 2006/11/07 22:36:56 cognet Exp $ * */ @@ -64,7 +64,8 @@ #define ARM_ARCH_4 0 #endif -#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || defined(CPU_XSCALE_80219) || \ +#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \ defined(CPU_XSCALE_PXA2X0)) || defined(CPU_ARM10) #define ARM_ARCH_5 1 #else @@ -113,7 +114,7 @@ #if(defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219)) + defined(CPU_XSCALE_80219)) || defined(CPU_XSCALE_81342) #define ARM_MMU_XSCALE 1 #else #define ARM_MMU_XSCALE 0 @@ -132,7 +133,7 @@ */ #if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_80219)) + defined(CPU_XSCALE_80219)) || defined(CPU_XSCALE_81342) #define ARM_XSCALE_PMU 1 #else #define ARM_XSCALE_PMU 0 ==== //depot/projects/jail2/sys/arm/include/cpufunc.h#3 (text+ko) ==== @@ -38,7 +38,7 @@ * * Prototypes for cpu, mmu and tlb related functions. * - * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.9 2006/08/24 23:51:28 cognet Exp $ + * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.10 2006/11/07 22:36:56 cognet Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -374,7 +374,7 @@ defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) void armv4_tlb_flushID (void); void armv4_tlb_flushI (void); @@ -392,7 +392,7 @@ #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ - defined(CPU_XSCALE_80219) + defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) void xscale_cpwait (void); void xscale_cpu_sleep (int mode); @@ -433,6 +433,28 @@ #endif /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 CPU_XSCALE_80219 */ +#ifdef CPU_XSCALE_81342 + +void xscalec3_cache_cleanID (void); +void xscalec3_cache_cleanD (void); + +void xscalec3_cache_purgeID (void); +void xscalec3_cache_purgeID_E (u_int entry); +void xscalec3_cache_purgeD (void); +void xscalec3_cache_purgeD_E (u_int entry); + +void xscalec3_cache_syncI (void); +void xscalec3_cache_cleanID_rng (vm_offset_t start, vm_size_t end); +void xscalec3_cache_cleanD_rng (vm_offset_t start, vm_size_t end); +void xscalec3_cache_purgeID_rng (vm_offset_t start, vm_size_t end); +void xscalec3_cache_purgeD_rng (vm_offset_t start, vm_size_t end); + + +void xscalec3_setttb (u_int ttb); +void xscalec3_context_switch (void); + +#endif /* CPU_XSCALE_81342 */ + #define tlb_flush cpu_tlb_flushID #define setttb cpu_setttb #define drain_writebuf cpu_drain_writebuf ==== //depot/projects/jail2/sys/arm/include/pmap.h#3 (text+ko) ==== @@ -44,7 +44,7 @@ * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 * - * $FreeBSD: src/sys/arm/include/pmap.h,v 1.20 2006/08/08 20:59:38 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.21 2006/11/07 22:36:56 cognet Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -426,7 +426,7 @@ extern void (*pmap_copy_page_func)(vm_paddr_t, vm_paddr_t); extern void (*pmap_zero_page_func)(vm_paddr_t, int, int); -#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 +#if (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 || defined(CPU_XSCALE_81342) void pmap_copy_page_generic(vm_paddr_t, vm_paddr_t); void pmap_zero_page_generic(vm_paddr_t, int, int); ==== //depot/projects/jail2/sys/boot/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.31 2006/10/09 04:43:06 kmacy Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.32 2006/11/05 22:03:02 marcel Exp $ .include <bsd.own.mk> @@ -8,7 +8,7 @@ .endif # Build EFI library. -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "ia64" SUBDIR+= efi .endif ==== //depot/projects/jail2/sys/boot/efi/include/efilib.h#3 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2000 Doug Rabson + * Copyright (c) 2006 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,24 +24,31 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.5 2006/11/02 02:42:47 marcel Exp $ + * $FreeBSD: src/sys/boot/efi/include/efilib.h,v 1.6 2006/11/05 22:03:02 marcel Exp $ */ -#include <efifpswa.h> +#include <stand.h> extern EFI_HANDLE IH; extern EFI_SYSTEM_TABLE *ST; extern EFI_BOOT_SERVICES *BS; extern EFI_RUNTIME_SERVICES *RS; -/* DIG64 Headless Console & Debug Port Table. */ -#define HCDP_TABLE_GUID \ - {0xf951938d,0x620b,0x42ef,{0x82,0x79,0xa8,0x4b,0x79,0x61,0x78,0x98}} +extern struct devsw efifs_dev; +extern struct fs_ops efifs_fsops; + +extern struct devsw efinet_dev; +extern struct netif_driver efinetif; void *efi_get_table(EFI_GUID *tbl); void efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table); -EFI_PHYSICAL_ADDRESS efimd_va2pa(EFI_VIRTUAL_ADDRESS); +int efi_register_handles(struct devsw *, EFI_HANDLE *, int); +EFI_HANDLE efi_find_handle(struct devsw *, int); +int efi_handle_lookup(EFI_HANDLE, struct devsw **, int *); + +int efi_status_to_errno(EFI_STATUS); +time_t efi_time(EFI_TIME *); EFI_STATUS main(int argc, CHAR16 *argv[]); void exit(EFI_STATUS status); ==== //depot/projects/jail2/sys/boot/efi/libefi/Makefile#2 (text+ko) ==== @@ -1,27 +1,16 @@ -# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.16 2004/11/28 00:30:22 marcel Exp $ +# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.17 2006/11/05 22:03:03 marcel Exp $ -.PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH} - LIB= efi INTERNALLIB= -SRCS= bootinfo.c copy.c delay.c devicename.c efi_console.c efifs.c efinet.c \ - elf_freebsd.c libefi.c module.c time.c +SRCS= delay.c efi_console.c efifs.c efinet.c errno.c handles.c libefi.c \ + time.c -.if ${MACHINE_ARCH} == "ia64" -SRCS+= efifpswa.c pal.S -.endif - CFLAGS+= -I${.CURDIR}/../include -CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH} +CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH:S/amd64/i386/} CFLAGS+= -I${.CURDIR}/../../../../lib/libstand # Pick up the bootstrap header for some interface items CFLAGS+= -I${.CURDIR}/../../common -# Make the disk code more talkative -.if defined(BOOT_DISK_DEBUG) -CFLAGS+= -DDISK_DEBUG -.endif - .include <bsd.lib.mk> ==== //depot/projects/jail2/sys/boot/efi/libefi/efifs.c#3 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2001 Doug Rabson + * Copyright (c) 2006 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,88 +23,100 @@ * LIABILITY, OR TORT (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/boot/efi/libefi/efifs.c,v 1.9 2006/11/02 01:23:17 marcel Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.10 2006/11/05 22:03:03 marcel Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611092007.kA9K7GMw080558>