Date: Wed, 7 Feb 2007 19:04:18 GMT From: Roman Divacky <rdivacky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 114201 for review Message-ID: <200702071904.l17J4Iwn044990@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=114201 Change 114201 by rdivacky@rdivacky_witten on 2007/02/07 19:03:33 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/linuxolator/src/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/at91_twi.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/at91/if_ate.c#5 integrate .. //depot/projects/linuxolator/src/sys/arm/conf/EP80219#3 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/linuxolator/src/sys/boot/common/loader.8#4 integrate .. //depot/projects/linuxolator/src/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/linuxolator/src/sys/coda/coda_vfsops.h#2 integrate .. //depot/projects/linuxolator/src/sys/conf/NOTES#17 integrate .. //depot/projects/linuxolator/src/sys/conf/files#17 integrate .. //depot/projects/linuxolator/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/linuxolator/src/sys/conf/kmod.mk#4 integrate .. //depot/projects/linuxolator/src/sys/conf/options#16 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pcireg.h#6 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/ad1816.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/mss.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/sb.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/ac97_patch.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/ac97_patch.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_aue.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uhub.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uipaq.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usb_subr.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/msdosfs_vfsops.c#7 integrate .. //depot/projects/linuxolator/src/sys/fs/procfs/procfs.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/geom_apple.c#2 delete .. //depot/projects/linuxolator/src/sys/geom/geom_gpt.c#3 delete .. //depot/projects/linuxolator/src/sys/geom/part/g_part.c#1 branch .. //depot/projects/linuxolator/src/sys/geom/part/g_part.h#1 branch .. //depot/projects/linuxolator/src/sys/geom/part/g_part_apm.c#1 branch .. //depot/projects/linuxolator/src/sys/geom/part/g_part_gpt.c#1 branch .. //depot/projects/linuxolator/src/sys/geom/part/g_part_if.m#1 branch .. //depot/projects/linuxolator/src/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/linuxolator/src/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/linuxolator/src/sys/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_conf.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_firmware.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_witness.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_socket.c#11 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/linuxolator/src/sys/net/if_tap.c#4 integrate .. //depot/projects/linuxolator/src/sys/net/if_tun.c#4 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_input.c#5 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/if_ether.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/in.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_carp.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw2.c#12 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_input.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_mroute.c#6 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_mroute.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/linuxolator/src/sys/netinet6/ah_core.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet6/nd6.c#8 integrate .. //depot/projects/linuxolator/src/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/linuxolator/src/sys/powerpc/conf/DEFAULTS#4 integrate .. //depot/projects/linuxolator/src/sys/powerpc/conf/GENERIC#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_framework.h#7 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_inet.c#7 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_internal.h#6 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_label.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_pipe.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_posix_sem.c#6 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_system.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_sysv_msg.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_sysv_sem.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_sysv_shm.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_vfs.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac_biba/mac_biba.c#6 integrate .. //depot/projects/linuxolator/src/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac_ifoff/mac_ifoff.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac_lomac/mac_lomac.c#7 integrate .. //depot/projects/linuxolator/src/sys/security/mac_mls/mac_mls.c#6 integrate .. //depot/projects/linuxolator/src/sys/security/mac_none/mac_none.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac_partition/mac_partition.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac_portacl/mac_portacl.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac_stub/mac_stub.c#6 integrate .. //depot/projects/linuxolator/src/sys/security/mac_test/mac_test.c#4 integrate .. //depot/projects/linuxolator/src/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/linuxolator/src/sys/sun4v/conf/GENERIC#6 integrate .. //depot/projects/linuxolator/src/sys/sys/_label.h#2 delete .. //depot/projects/linuxolator/src/sys/sys/apm.h#1 branch .. //depot/projects/linuxolator/src/sys/sys/conf.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/lock.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/mac.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/param.h#10 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/linuxolator/src/sys/ufs/ufs/ufs_quota.c#7 integrate .. //depot/projects/linuxolator/src/sys/vm/swap_pager.c#6 integrate .. //depot/projects/linuxolator/src/sys/vm/swap_pager.h#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_contig.c#5 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_page.c#7 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_zeroidle.c#5 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/conf/GENERIC#8 (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.471 2006/12/13 03:41:47 yongari Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.472 2007/02/07 18:55:29 marcel Exp $ cpu HAMMER ident GENERIC @@ -43,7 +43,7 @@ options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework -options GEOM_GPT # GUID Partition Tables. +options GEOM_PART_GPT # GUID Partition Tables. options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!] options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 ==== //depot/projects/linuxolator/src/sys/amd64/include/gdb_machdep.h#2 (text+ko) ==== @@ -23,13 +23,13 @@ * (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/include/gdb_machdep.h,v 1.5 2006/04/04 03:00:20 marcel Exp $ + * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.6 2007/02/05 21:48:32 jhb Exp $ */ #ifndef _MACHINE_GDB_MACHDEP_H_ #define _MACHINE_GDB_MACHDEP_H_ -#define GDB_BUFSZ 500 +#define GDB_BUFSZ (GDB_NREGS * 16) #define GDB_NREGS 56 #define GDB_REG_PC 16 ==== //depot/projects/linuxolator/src/sys/amd64/include/pcpu.h#2 (text+ko) ==== @@ -23,14 +23,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.44 2005/03/11 22:16:09 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.46 2007/02/06 18:04:02 bde Exp $ */ #ifndef _MACHINE_PCPU_H_ -#define _MACHINE_PCPU_H_ +#define _MACHINE_PCPU_H_ #ifndef _SYS_CDEFS_H_ -#error this file needs sys/cdefs.h as a prerequisite +#error "sys/cdefs.h is a prerequisite for this file" #endif #ifdef _KERNEL @@ -51,16 +51,15 @@ u_int pc_apic_id; \ u_int pc_acpi_id /* ACPI CPU id */ -#if defined(lint) - +#ifdef lint + extern struct pcpu *pcpup; - -#define PCPU_GET(member) (pcpup->pc_ ## member) -#define PCPU_PTR(member) (&pcpup->pc_ ## member) -#define PCPU_SET(member,value) (pcpup->pc_ ## member = (value)) - -#elif defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE___TYPEOF) \ - && defined(__GNUCLIKE___OFFSETOF) + +#define PCPU_GET(member) (pcpup->pc_ ## member) +#define PCPU_PTR(member) (&pcpup->pc_ ## member) +#define PCPU_SET(member, val) (pcpup->pc_ ## member = (val)) + +#elif defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE___TYPEOF) /* * Evaluates to the byte offset of the per-cpu variable name. @@ -92,69 +91,39 @@ * Evaluates to the value of the per-cpu variable name. */ #define __PCPU_GET(name) __extension__ ({ \ - __pcpu_type(name) __result; \ + __pcpu_type(name) __res; \ + struct __s { \ + u_char __b[MIN(sizeof(__pcpu_type(name)), 8)]; \ + } __s; \ \ - if (sizeof(__result) == 1) { \ - u_char __b; \ - __asm __volatile("movb %%gs:%1,%0" \ - : "=r" (__b) \ - : "m" (*(u_char *)(__pcpu_offset(name)))); \ - __result = *(__pcpu_type(name) *)&__b; \ - } else if (sizeof(__result) == 2) { \ - u_short __w; \ - __asm __volatile("movw %%gs:%1,%0" \ - : "=r" (__w) \ - : "m" (*(u_short *)(__pcpu_offset(name)))); \ - __result = *(__pcpu_type(name) *)&__w; \ - } else if (sizeof(__result) == 4) { \ - u_int __i; \ - __asm __volatile("movl %%gs:%1,%0" \ - : "=r" (__i) \ - : "m" (*(u_int *)(__pcpu_offset(name)))); \ - __result = *(__pcpu_type(name) *)&__i; \ - } else if (sizeof(__result) == 8) { \ - u_long __l; \ - __asm __volatile("movq %%gs:%1,%0" \ - : "=r" (__l) \ - : "m" (*(u_long *)(__pcpu_offset(name)))); \ - __result = *(__pcpu_type(name) *)&__l; \ + if (sizeof(__res) == 1 || sizeof(__res) == 2 || \ + sizeof(__res) == 4 || sizeof(__res) == 8) { \ + __asm __volatile("mov %%gs:%1,%0" \ + : "=r" (__s) \ + : "m" (*(struct __s *)(__pcpu_offset(name)))); \ + *(struct __s *)(void *)&__res = __s; \ } else { \ - __result = *__PCPU_PTR(name); \ + __res = *__PCPU_PTR(name); \ } \ - \ - __result; \ + __res; \ }) /* * Sets the value of the per-cpu variable name to value val. */ #define __PCPU_SET(name, val) { \ - __pcpu_type(name) __val = (val); \ + __pcpu_type(name) __val; \ + struct __s { \ + u_char __b[MIN(sizeof(__pcpu_type(name)), 8)]; \ + } __s; \ \ - if (sizeof(__val) == 1) { \ - u_char __b; \ - __b = *(u_char *)&__val; \ - __asm __volatile("movb %1,%%gs:%0" \ - : "=m" (*(u_char *)(__pcpu_offset(name))) \ - : "r" (__b)); \ - } else if (sizeof(__val) == 2) { \ - u_short __w; \ - __w = *(u_short *)&__val; \ - __asm __volatile("movw %1,%%gs:%0" \ - : "=m" (*(u_short *)(__pcpu_offset(name))) \ - : "r" (__w)); \ - } else if (sizeof(__val) == 4) { \ - u_int __i; \ - __i = *(u_int *)&__val; \ - __asm __volatile("movl %1,%%gs:%0" \ - : "=m" (*(u_int *)(__pcpu_offset(name))) \ - : "r" (__i)); \ - } else if (sizeof(__val) == 8) { \ - u_long __l; \ - __l = *(u_long *)&__val; \ - __asm __volatile("movq %1,%%gs:%0" \ - : "=m" (*(u_long *)(__pcpu_offset(name))) \ - : "r" (__l)); \ + __val = (val); \ + if (sizeof(__val) == 1 || sizeof(__val) == 2 || \ + sizeof(__val) == 4 || sizeof(__val) == 8) { \ + __s = *(struct __s *)(void *)&__val; \ + __asm __volatile("mov %1,%%gs:%0" \ + : "=m" (*(struct __s *)(__pcpu_offset(name))) \ + : "r" (__s)); \ } else { \ *__PCPU_PTR(name) = __val; \ } \ @@ -172,12 +141,14 @@ __asm __volatile("movq %%gs:0,%0" : "=r" (td)); return (td); } -#define curthread (__curthread()) +#define curthread (__curthread()) + +#else /* !lint || defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE___TYPEOF) */ + +#error "this file needs to be ported to your compiler" -#else -#error this file needs to be ported to your compiler -#endif +#endif /* lint, etc. */ -#endif /* _KERNEL */ +#endif /* _KERNEL */ -#endif /* ! _MACHINE_PCPU_H_ */ +#endif /* !_MACHINE_PCPU_H_ */ ==== //depot/projects/linuxolator/src/sys/arm/arm/pmap.c#6 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.77 2006/12/04 12:55:00 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.78 2007/02/05 10:33:39 kevlo Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -157,7 +157,6 @@ #include <sys/vmmeter.h> #include <sys/mman.h> #include <sys/smp.h> -#include <sys/sx.h> #include <sys/sched.h> #include <vm/vm.h> ==== //depot/projects/linuxolator/src/sys/arm/at91/at91_twi.c#4 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.7 2006/11/29 08:15:59 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.8 2007/02/06 12:07:14 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -375,3 +375,4 @@ DRIVER_MODULE(at91_twi, atmelarm, at91_twi_driver, at91_twi_devclass, 0, 0); DRIVER_MODULE(iicbus, at91_twi, iicbus_driver, iicbus_devclass, 0, 0); +MODULE_DEPEND(at91_twi, iicbus, 1, 1, 1); ==== //depot/projects/linuxolator/src/sys/arm/at91/if_ate.c#5 (text) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.15 2007/01/05 01:07:59 ticso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.16 2007/02/03 07:46:26 kevlo Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -203,7 +203,6 @@ ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_capabilities |= IFCAP_VLAN_MTU; ifp->if_capenable |= IFCAP_VLAN_MTU; /* the hw bits already set */ ==== //depot/projects/linuxolator/src/sys/arm/conf/EP80219#3 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/EP80219,v 1.3 2006/10/26 22:11:35 jb Exp $ +# $FreeBSD: src/sys/arm/conf/EP80219,v 1.4 2007/02/07 18:55:29 marcel Exp $ machine arm ident EP80219 @@ -56,7 +56,7 @@ options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options GEOM_GPT # GUID Partition Tables. +options GEOM_PART_GPT # GUID Partition Tables. options GEOM_MBR # DOS/MBR partitioning options GEOM_LABEL # Providers labelization. ==== //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/if_npe.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.3 2007/01/30 01:18:29 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.4 2007/02/03 07:46:26 kevlo Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -325,7 +325,6 @@ ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_start = npestart; ifp->if_ioctl = npeioctl; ==== //depot/projects/linuxolator/src/sys/boot/common/loader.8#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.90 2006/11/29 05:53:25 yar Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.91 2007/02/04 06:35:10 imp Exp $ .\" .Dd November 29, 2006 .Dt LOADER 8 @@ -423,12 +423,63 @@ .It Va currdev Selects the default device. Syntax for devices is odd. +.It Va init_chroot +If set to a valid directory in the root file system, it causes +.Xr init 8 +to perform a +.Xr chroot 2 +operation on that directory, making it the new root directory. +That happens before entering single-user mode or multi-user +mode (but after executing the +.Va init_script +if enabled). .It Va init_path Sets the list of binaries which the kernel will try to run as the initial process. The first matching binary is used. The default list is .Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:\:/rescue/init:/stand/sysinstall . +.It Va init_script +If set to a valid file name in the root file system, +instructs +.Xr init 8 +to run that script as the very first action, +before doing anything else. +Signal handling and exit code interpretation is similar to +running the +.Pa /etc/rc +script. +In particular, single-user operation is enforced +if the script terminates with a non-zero exit code, +or if a SIGTERM is delivered to the +.Xr init 8 +process (PID 1). +.It Va init_script +Defines the shell binary to be used for executing the various shell scripts. +The default is +.Dq Li /bin/sh . +It is used for running the +.Va init_script +if set, as well as for the +.Pa /etc/rc +and +.Pa /etc/rc.shutdown +scripts. +The value of the corresponding +.Xr kenv 2 +variable is evaluated every time +.Xr init 8 +calls a shell script, so it can be changed later on using the +.Xr kenv 1 +utility. +In particular, if a non-default shell is used for running an +.Va init_script , +it might be desirable to have that script reset the value of +.Va init_shell +back to the default, so that the +.Pa /etc/rc +script is executed with the standard shell +.Pa /bin/sh . .It Va interpret Has the value .Dq Li OK ==== //depot/projects/linuxolator/src/sys/boot/forth/loader.conf#5 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.117 2007/01/14 13:55:43 maxim Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.118 2007/02/04 06:35:10 imp Exp $ ############################################################## ### Basic configuration options ############################ @@ -77,6 +77,9 @@ #boot_verbose="" # -v: Causes extra debugging information to be printed #init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall" # Sets the list of init candidates +#init_shell="/bin/sh" # The shell binary used by init(8). +#init_script="" # Initial script to run by init(8) before chrooting. +#init_chroot="" # Directory for init(8) to chroot into. ############################################################## ==== //depot/projects/linuxolator/src/sys/coda/coda_vfsops.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/cfs/coda_vfsops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_vfsops.h,v 1.10 2005/02/20 23:01:57 das Exp $ + * $FreeBSD: src/sys/coda/coda_vfsops.h,v 1.11 2007/02/02 15:47:28 pjd Exp $ * */ @@ -57,7 +57,6 @@ vfs_statfs_t coda_nb_statfs; vfs_sync_t coda_sync; vfs_vget_t coda_vget; -vfs_vptofh_t coda_vptofh; vfs_init_t coda_init; int getNewVnode(struct vnode **vpp); ==== //depot/projects/linuxolator/src/sys/conf/NOTES#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1408 2007/01/30 05:01:06 rodrigc Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1409 2007/02/07 18:55:29 marcel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -136,7 +136,6 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel options GEOM_AES # Don't use, use GEOM_BDE -options GEOM_APPLE # Apple partitioning options GEOM_BDE # Disk encryption. options GEOM_BSD # BSD disklabels options GEOM_CACHE # Disk cache. @@ -144,12 +143,13 @@ options GEOM_ELI # Disk encryption. options GEOM_FOX # Redundant path mitigation options GEOM_GATE # Userland services. -options GEOM_GPT # GPT partitioning options GEOM_JOURNAL # Journaling. options GEOM_LABEL # Providers labelization. options GEOM_MBR # DOS/MBR partitioning options GEOM_MIRROR # Disk mirroring. options GEOM_NOP # Test class. +options GEOM_PART_APM # Apple partitioning +options GEOM_PART_GPT # GPT partitioning options GEOM_PC98 # NEC PC9800 partitioning options GEOM_RAID3 # RAID3 functionality. options GEOM_SHSEC # Shared secret. ==== //depot/projects/linuxolator/src/sys/conf/files#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1173 2007/01/30 03:11:45 rodrigc Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1175 2007/02/07 18:55:29 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -754,8 +754,8 @@ dev/mlx/mlx_pci.c optional mlx pci dev/mly/mly.c optional mly dev/mmc/mmc.c optional mmc -dev/mmc/mmcbr_if.m optional mmc -dev/mmc/mmcbus_if.m optional mmc +dev/mmc/mmcbr_if.m standard +dev/mmc/mmcbus_if.m standard dev/mmc/mmcsd.c optional mmcsd dev/mpt/mpt.c optional mpt dev/mpt/mpt_cam.c optional mpt @@ -1178,7 +1178,6 @@ geom/eli/pkcs5v2.c optional geom_eli geom/gate/g_gate.c optional geom_gate geom/geom_aes.c optional geom_aes -geom/geom_apple.c optional geom_apple geom/geom_bsd.c optional geom_bsd geom/geom_bsd_enc.c optional geom_bsd geom/geom_ccd.c optional ccd | geom_ccd @@ -1188,7 +1187,6 @@ geom/geom_dump.c standard geom/geom_event.c standard geom/geom_fox.c optional geom_fox -geom/geom_gpt.c optional geom_gpt geom/geom_io.c standard geom/geom_kern.c standard geom/geom_mbr.c optional geom_mbr @@ -1213,6 +1211,10 @@ geom/mirror/g_mirror.c optional geom_mirror geom/mirror/g_mirror_ctl.c optional geom_mirror geom/nop/g_nop.c optional geom_nop +geom/part/g_part.c standard +geom/part/g_part_if.m standard +geom/part/g_part_apm.c optional geom_part_apm +geom/part/g_part_gpt.c optional geom_part_gpt geom/raid3/g_raid3.c optional geom_raid3 geom/raid3/g_raid3_ctl.c optional geom_raid3 geom/shsec/g_shsec.c optional geom_shsec ==== //depot/projects/linuxolator/src/sys/conf/files.powerpc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.61 2006/12/18 05:45:23 mjacob Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.62 2007/02/07 18:55:29 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -32,7 +32,6 @@ dev/syscons/scterm-sc.c optional sc dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_powerpc.c optional uart -geom/geom_apple.c standard kern/syscalls.c optional ktr powerpc/powerpc/atomic.S standard powerpc/powerpc/autoconf.c standard ==== //depot/projects/linuxolator/src/sys/conf/kmod.mk#4 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.213 2006/10/20 07:31:15 imp Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.214 2007/02/03 06:46:11 imp Exp $ # # The include file <bsd.kmod.mk> handles building and installing loadable # kernel modules. @@ -318,7 +318,7 @@ MFILES?= dev/acpica/acpi_if.m dev/ata/ata_if.m dev/eisa/eisa_if.m \ dev/iicbus/iicbb_if.m dev/iicbus/iicbus_if.m \ - dev/mmc/mmcbr_if.m mmc/mmcbus_if.m \ + dev/mmc/mmcbr_if.m dev/mmc/mmcbus_if.m \ dev/mii/miibus_if.m dev/ofw/ofw_bus_if.m \ dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ ==== //depot/projects/linuxolator/src/sys/conf/options#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.574 2007/01/30 05:01:06 rodrigc Exp $ +# $FreeBSD: src/sys/conf/options,v 1.575 2007/02/07 18:55:29 marcel Exp $ # # On the handling of kernel options # @@ -74,7 +74,6 @@ FULL_PREEMPTION opt_sched.h IPI_PREEMPTION opt_sched.h GEOM_AES opt_geom.h -GEOM_APPLE opt_geom.h GEOM_BDE opt_geom.h GEOM_BSD opt_geom.h GEOM_CACHE opt_geom.h @@ -82,12 +81,13 @@ GEOM_ELI opt_geom.h GEOM_FOX opt_geom.h GEOM_GATE opt_geom.h -GEOM_GPT opt_geom.h GEOM_JOURNAL opt_geom.h GEOM_LABEL opt_geom.h GEOM_MBR opt_geom.h GEOM_MIRROR opt_geom.h GEOM_NOP opt_geom.h +GEOM_PART_APM opt_geom.h +GEOM_PART_GPT opt_geom.h GEOM_PC98 opt_geom.h GEOM_RAID3 opt_geom.h GEOM_SHSEC opt_geom.h ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-chipset.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.179 2007/01/04 16:09:11 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.180 2007/02/03 20:12:00 rink Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -118,6 +118,8 @@ static void ata_marvell_edma_dmainit(device_t dev); static int ata_national_chipinit(device_t dev); static void ata_national_setmode(device_t dev, int mode); +static int ata_netcell_chipinit(device_t dev); +static int ata_netcell_allocate(device_t dev); static int ata_nvidia_chipinit(device_t dev); static int ata_nvidia_allocate(device_t dev); static int ata_nvidia_status(device_t dev); @@ -2855,6 +2857,49 @@ } } +/* + * NetCell chipset support functions + */ +int +ata_netcell_ident(device_t dev) +{ + struct ata_pci_controller *ctlr = device_get_softc(dev); + + if (pci_get_devid(dev) == ATA_NETCELL_SR) { + device_set_desc(dev, "Netcell SyncRAID SR3000/5000 RAID Controller"); + ctlr->chipinit = ata_netcell_chipinit; + return 0; + } + return ENXIO; +} + +static int +ata_netcell_chipinit(device_t dev) +{ + struct ata_pci_controller *ctlr = device_get_softc(dev); + + if (ata_generic_chipinit(dev)) + return ENXIO; + + ctlr->allocate = ata_netcell_allocate; + return 0; +} + +static int +ata_netcell_allocate(device_t dev) +{ + struct ata_channel *ch = device_get_softc(dev); + + /* setup the usual register normal pci style */ + if (ata_pci_allocate(dev)) + return ENXIO; + + /* don't use 32 bit PIO transfers; these cause the NetCell to return + * garbage */ + ch->flags |= ATA_USE_16BIT; + + return 0; +} /* * nVidia chipset support functions ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.117 2006/05/12 05:04:40 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.118 2007/02/03 20:12:00 rink Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -120,6 +120,10 @@ if (!ata_national_ident(dev)) return ATA_PROBE_OK; break; + case ATA_NETCELL_ID: + if (!ata_netcell_ident(dev)) + return ATA_PROBE_OK; + break; case ATA_NVIDIA_ID: if (!ata_nvidia_ident(dev)) return ATA_PROBE_OK; ==== //depot/projects/linuxolator/src/sys/dev/ata/ata-pci.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * (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/dev/ata/ata-pci.h,v 1.73 2007/01/04 16:09:11 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.74 2007/02/03 20:12:00 rink Exp $ */ /* structure holding chipset config info */ @@ -198,6 +198,9 @@ #define ATA_NATIONAL_ID 0x100b #define ATA_SC1100 0x0502100b +#define ATA_NETCELL_ID 0x169c +#define ATA_NETCELL_SR 0x0044169c + #define ATA_NVIDIA_ID 0x10de #define ATA_NFORCE1 0x01bc10de #define ATA_NFORCE2 0x006510de @@ -450,6 +453,7 @@ int ata_marvell_ident(device_t); int ata_national_ident(device_t); int ata_nvidia_ident(device_t); +int ata_netcell_ident(device_t); int ata_promise_ident(device_t); int ata_serverworks_ident(device_t); int ata_sii_ident(device_t); ==== //depot/projects/linuxolator/src/sys/dev/atkbdc/psm.c#3 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/atkbdc/psm.c,v 1.90 2006/12/18 18:48:28 keramida Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/atkbdc/psm.c,v 1.91 2007/02/04 12:47:52 dumbbell Exp $"); #include "opt_isa.h" #include "opt_psm.h" @@ -1251,6 +1251,16 @@ endprobe(ENXIO); } + /* + * Synaptics TouchPad seems to go back to Relative Mode after + * the previous set_controller_command_byte() call; by issueing + * a Read Mode Byte command, the touchpad is in Absolute Mode + * again. + */ + if (sc->hw.model == MOUSE_MODEL_SYNAPTICS) { + mouse_ext_command(sc->kbdc, 1); + } + /* done */ kbdc_set_device_mask(sc->kbdc, mask | KBD_AUX_CONTROL_BITS); kbdc_lock(sc->kbdc, FALSE); ==== //depot/projects/linuxolator/src/sys/dev/pccard/pccard.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard.c,v 1.115 2006/04/27 20:47:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard.c,v 1.116 2007/02/03 07:09:36 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -297,6 +297,7 @@ struct pccard_softc *sc = PCCARD_SOFTC(dev); struct pccard_function *pf; struct pccard_config_entry *cfe; + struct pccard_ivar *devi; int state; /* @@ -312,7 +313,9 @@ if (pf->cfe != NULL) pccard_function_disable(pf); pccard_function_free(pf); + devi = PCCARD_IVAR(pf->dev); device_delete_child(dev, pf->dev); + free(devi, M_DEVBUF); } if (sc->sc_enabled_count == 0) POWER_DISABLE_SOCKET(device_get_parent(dev), dev); ==== //depot/projects/linuxolator/src/sys/dev/pci/pcireg.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * (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/dev/pci/pcireg.h,v 1.57 2007/01/19 22:37:52 jhb Exp $ + * $FreeBSD: src/sys/dev/pci/pcireg.h,v 1.58 2007/02/02 19:48:25 jhb Exp $ * */ @@ -506,9 +506,31 @@ #define PCIR_HTMSI_ADDRESS_LO 0x4 #define PCIR_HTMSI_ADDRESS_HI 0x8 +/* PCI Vendor capability definitions */ +#define PCIR_VENDOR_LENGTH 0x2 +#define PCIR_VENDOR_DATA 0x3 + +/* PCI EHCI Debug Port definitions */ +#define PCIR_DEBUG_PORT 0x2 +#define PCIM_DEBUG_PORT_OFFSET 0x1FFF +#define PCIM_DEBUG_PORT_BAR 0xe000 + /* PCI-PCI Bridge Subvendor definitions */ #define PCIR_SUBVENDCAP_ID 0x4 +/* PCI Express definitions */ +#define PCIR_EXPRESS_FLAGS 0x2 +#define PCIM_EXP_FLAGS_VERSION 0x000F +#define PCIM_EXP_FLAGS_TYPE 0x00F0 +#define PCIM_EXP_TYPE_ENDPOINT 0x0000 +#define PCIM_EXP_TYPE_LEGACY_ENDPOINT 0x0010 +#define PCIM_EXP_TYPE_ROOT_PORT 0x0040 +#define PCIM_EXP_TYPE_UPSTREAM_PORT 0x0050 +#define PCIM_EXP_TYPE_DOWNSTREAM_PORT 0x0060 +#define PCIM_EXP_TYPE_PCI_BRIDGE 0x0070 +#define PCIM_EXP_FLAGS_SLOT 0x0100 +#define PCIM_EXP_FLAGS_IRQ 0x3e00 + /* MSI-X definitions */ #define PCIR_MSIX_CTRL 0x2 #define PCIM_MSIXCTRL_MSIX_ENABLE 0x8000 ==== //depot/projects/linuxolator/src/sys/dev/sound/isa/ad1816.c#2 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright (c) 1999 Cameron Grant <cg@freebsd.org> - * Copyright Luigi Rizzo, 1997,1998 - * Copyright by Hannu Savolainen 1994, 1995 + * Copyright (c) 1997,1998 Luigi Rizzo + * Copyright (c) 1994,1995 Hannu Savolainen * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -33,7 +33,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.39 2006/03/21 03:47:25 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.40 2007/02/02 13:39:20 joel Exp $"); struct ad1816_info; ==== //depot/projects/linuxolator/src/sys/dev/sound/isa/ad1816.h#2 (text+ko) ==== @@ -1,10 +1,34 @@ /*- - * (C) 1997 Luigi Rizzo (luigi@iet.unipi.it) + * Copyright (c) 1997 Luigi Rizzo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * 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/dev/sound/isa/ad1816.h,v 1.4 2007/02/02 13:44:09 joel Exp $ + */ + +/* * This file contains information and macro definitions for * the ad1816 chip - * - * $FreeBSD: src/sys/dev/sound/isa/ad1816.h,v 1.2 2005/01/06 01:43:17 imp Exp $ */ /* AD1816 register macros */ ==== //depot/projects/linuxolator/src/sys/dev/sound/isa/ess.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999 Cameron Grant <cg@freebsd.org> - * Copyright 1997,1998 Luigi Rizzo. + * Copyright (c) 1997,1998 Luigi Rizzo * * Derived from files in the Voxware 3.5 distribution, * Copyright by Hannu Savolainen 1994, under the same copyright @@ -38,7 +38,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.36 2006/01/16 20:01:33 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ess.c,v 1.37 2007/02/02 13:39:20 joel Exp $"); #define ESS_BUFFSIZE (4096) #define ABS(x) (((x) < 0)? -(x) : (x)) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200702071904.l17J4Iwn044990>