Date: Tue, 27 Jun 2006 10:08:19 GMT From: Roman Divacky <rdivacky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 100130 for review Message-ID: <200606271008.k5RA8JVx019564@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=100130 Change 100130 by rdivacky@rdivacky_witten on 2006/06/27 10:07:39 IFC Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/pmap.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/conf/GENERIC#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/conf/NOTES#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/locore.S#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/files.at91#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/cam/cam_xpt.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/syscalls.master#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/NOTES#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files.amd64#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files.i386#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/options#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ath/if_ath.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ath/if_athvar.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/rgephy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mpt/mpt.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mpt/mpt.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/nfe/if_nfe.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/nfe/if_nfereg.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/nfe/if_nfevar.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/dev/re/if_re.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/geom/geom_gpt.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/conf/GENERIC#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/conf/NOTES#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/pmap.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/conf/GENERIC#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/disasm/disasm.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/disasm/disasm_decode.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/disasm/disasm_extract.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/disasm/disasm_format.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/disasm/disasm_int.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/ia64/machdep.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/ia64/pmap.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_linker.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_module.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/link_elf.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/link_elf_obj.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/subr_bus.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/subr_firmware.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_usrreq.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/vfs_init.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/vfs_subr.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/vfs_vnops.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/Makefile#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/nfe/Makefile#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_enc.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_types.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_vlan.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/ip_fw2.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/tcp_input.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/tcp_syncache.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/tcp_var.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet6/raw_ip6.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netipsec/ipsec.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netipsec/ipsec_input.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netipsec/ipsec_output.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netipsec/xform_ipip.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/nfsserver/nfsrvcache.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/pc98/conf/GENERIC#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/pci/agp_i810.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/pci/if_rlreg.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/powerpc/conf/GENERIC#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/powerpc/powerpc/mmu_oea.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sparc64/conf/GENERIC#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/gpt.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/rwlock.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/sx.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/vm_page.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/vm_pageq.c#2 integrate Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/pmap.c#3 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.558 2006/06/20 20:52:10 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.560 2006/06/27 04:28:22 alc Exp $"); /* * Manages physical address maps. @@ -2674,7 +2674,7 @@ PHYS_TO_DMAP(VM_PAGE_TO_PHYS(dstmpde)); pde = &pde[pmap_pde_index(addr)]; if (*pde == 0) { - *pde = srcptepaddr; + *pde = srcptepaddr & ~PG_W; dst_pmap->pm_stats.resident_count += NBPDR / PAGE_SIZE; } else @@ -2697,11 +2697,6 @@ * we only virtual copy managed pages */ if ((ptetemp & PG_MANAGED) != 0) { - /* - * We have to check after allocpte for the - * pte still being around... allocpte can - * block. - */ dstmpte = pmap_allocpte(dst_pmap, addr, M_NOWAIT); if (dstmpte == NULL) @@ -2713,14 +2708,16 @@ pmap_try_insert_pv_entry(dst_pmap, addr, PHYS_TO_VM_PAGE(ptetemp & PG_FRAME))) { /* - * Clear the modified and + * Clear the wired, modified, and * accessed (referenced) bits * during the copy. */ - *dst_pte = ptetemp & ~(PG_M | PG_A); + *dst_pte = ptetemp & ~(PG_W | PG_M | + PG_A); dst_pmap->pm_stats.resident_count++; } else - pmap_unwire_pte_hold(dst_pmap, addr, dstmpte); + pmap_unwire_pte_hold(dst_pmap, addr, + dstmpte); if (dstmpte->wire_count >= srcmpte->wire_count) break; } ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/conf/GENERIC#3 (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.460 2006/06/15 19:58:52 netchild Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.462 2006/06/26 22:03:20 babkin Exp $ cpu HAMMER ident GENERIC ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/conf/NOTES#3 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.56 2006/06/12 20:38:17 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.57 2006/06/26 23:41:06 obrien Exp $ # # @@ -223,6 +223,7 @@ # (requires miibus) # ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter # iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters +# nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking # ral: Ralink Technology IEEE 802.11 wireless adapter # ural: Ralink Technology RT2500USB IEEE 802.11 wireless adapter @@ -233,6 +234,7 @@ options ED_SIC device iwi device ipw +device nfe # nVidia nForce MCP on-board Ethernet Networking device nve # nVidia nForce MCP on-board Ethernet Networking device ral device ural ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.13 2006/06/20 20:41:28 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.14 2006/06/26 18:37:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.13 2006/06/20 20:41:28 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.14 2006/06/26 18:37:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.13 2006/06/20 20:41:28 netchild Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.14 2006/06/26 18:37:35 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp */ #include <bsm/audit_kevents.h> @@ -65,7 +65,7 @@ { SYF_MPSAFE | AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE }, /* 42 = linux_pipe */ { SYF_MPSAFE | AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 43 = linux_times */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = prof */ - { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ + { SYF_MPSAFE | AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ { SYF_MPSAFE | AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID }, /* 46 = linux_setgid16 */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid16, AUE_GETGID }, /* 47 = linux_getgid16 */ { SYF_MPSAFE | AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL }, /* 48 = linux_signal */ ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#6 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.11 2006/06/20 20:38:44 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.12 2006/06/26 18:36:16 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -103,7 +103,7 @@ 42 AUE_PIPE MSTD { int linux_pipe(l_ulong *pipefds); } 43 AUE_NULL MSTD { int linux_times(struct l_times_argv *buf); } 44 AUE_NULL UNIMPL prof -45 AUE_NULL STD { int linux_brk(l_ulong dsend); } +45 AUE_NULL MSTD { int linux_brk(l_ulong dsend); } 46 AUE_SETGID MSTD { int linux_setgid16(l_gid16_t gid); } 47 AUE_GETGID MSTD { int linux_getgid16(void); } 48 AUE_NULL MSTD { int linux_signal(l_int sig, \ ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/elf_trampoline.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.8 2006/06/18 22:46:30 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.11 2006/06/23 22:45:35 cognet Exp $"); #include <machine/asm.h> #include <sys/types.h> #include <sys/elf32.h> @@ -131,6 +131,8 @@ } } +static void arm9_setup(void); + void _start(void) { @@ -174,7 +176,6 @@ __start(); } -#ifdef KZIP static void get_cachetype_cp15() { @@ -255,6 +256,7 @@ } +#ifdef KZIP static unsigned char *orig_input, *i_input, *i_output; @@ -348,8 +350,8 @@ int d) { Elf32_Ehdr *eh; - Elf32_Phdr phdr[512] /* XXX */, *php; - Elf32_Shdr shdr[512] /* XXX */; + Elf32_Phdr phdr[64] /* XXX */, *php; + Elf32_Shdr shdr[64] /* XXX */; int i,j; void *entry_point; int symtabindex = -1; ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/locore.S#2 (text+ko) ==== @@ -37,9 +37,9 @@ #include <machine/asm.h> #include <machine/armreg.h> #include <machine/pte.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.13 2005/12/21 15:02:31 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.14 2006/06/21 23:47:25 imp Exp $"); -/* What size should this really be ? It is only used by init_arm() */ +/* What size should this really be ? It is only used by initarm() */ #define INIT_ARM_STACK_SIZE 2048 /* ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/at91/files.at91#2 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/at91/files.at91,v 1.3 2006/03/24 07:36:23 imp Exp $ +# $FreeBSD: src/sys/arm/at91/files.at91,v 1.5 2006/06/23 23:07:11 cognet Exp $ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91.c standard ==== //depot/projects/soc2006/rdivacky_linuxolator/cam/cam_xpt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.160 2006/06/05 22:22:14 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.162 2006/06/26 05:41:11 mjacob Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -387,6 +387,11 @@ /*quirks*/0, /*mintags*/0, /*maxtags*/0 }, { + /* Does not support other than LUN 0 */ + { T_DIRECT, SIP_MEDIA_FIXED, "VMware*", "*", "*" }, + CAM_QUIRK_NOLUNS, /*mintags*/0, /*maxtags*/0 + }, + { /* * Broken tagged queuing drive. * Submitted by: ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_proto.h#2 (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.54 2006/03/30 07:43:01 ps Exp $ - * created from FreeBSD + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.55 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.66 2006/06/26 18:35:57 jhb Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_syscall.h#2 (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.52 2006/03/30 07:43:01 ps Exp $ - * created from FreeBSD + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.53 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.66 2006/06/26 18:35:57 jhb Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_syscalls.c#2 (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.43 2006/03/30 07:43:01 ps Exp $ - * created from FreeBSD + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.44 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.66 2006/06/26 18:35:57 jhb Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_sysent.c#2 (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.53 2006/03/30 07:43:01 ps Exp $ - * created from FreeBSD + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.54 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.66 2006/06/26 18:35:57 jhb Exp */ #include "opt_compat.h" @@ -168,9 +168,9 @@ { SYF_MPSAFE | AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO }, /* 133 = sendto */ { SYF_MPSAFE | AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN }, /* 134 = shutdown */ { SYF_MPSAFE | AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR }, /* 135 = socketpair */ - { AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR }, /* 136 = mkdir */ - { AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR }, /* 137 = rmdir */ - { AS(freebsd32_utimes_args), (sy_call_t *)freebsd32_utimes, AUE_UTIMES }, /* 138 = freebsd32_utimes */ + { SYF_MPSAFE | AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR }, /* 136 = mkdir */ + { SYF_MPSAFE | AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR }, /* 137 = rmdir */ + { SYF_MPSAFE | AS(freebsd32_utimes_args), (sy_call_t *)freebsd32_utimes, AUE_UTIMES }, /* 138 = freebsd32_utimes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = obsolete 4.2 sigreturn */ { SYF_MPSAFE | AS(freebsd32_adjtime_args), (sy_call_t *)freebsd32_adjtime, AUE_ADJTIME }, /* 140 = freebsd32_adjtime */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 141 = obsolete ogetpeername */ @@ -387,10 +387,10 @@ { SYF_MPSAFE | AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL }, /* 352 = __acl_delete_fd */ { SYF_MPSAFE | AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL }, /* 353 = __acl_aclcheck_file */ { SYF_MPSAFE | AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL }, /* 354 = __acl_aclcheck_fd */ - { AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_NULL }, /* 355 = extattrctl */ - { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_NULL }, /* 356 = extattr_set_file */ - { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_NULL }, /* 357 = extattr_get_file */ - { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_NULL }, /* 358 = extattr_delete_file */ + { SYF_MPSAFE | AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_NULL }, /* 355 = extattrctl */ + { SYF_MPSAFE | AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_NULL }, /* 356 = extattr_set_file */ + { SYF_MPSAFE | AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_NULL }, /* 357 = extattr_get_file */ + { SYF_MPSAFE | AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_NULL }, /* 358 = extattr_delete_file */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 359 = aio_waitcomplete */ { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL }, /* 360 = getresuid */ { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL }, /* 361 = getresgid */ @@ -403,9 +403,9 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 368 = __cap_set_fd */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 369 = __cap_set_file */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 370 = lkmressys */ - { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_NULL }, /* 371 = extattr_set_fd */ - { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_NULL }, /* 372 = extattr_get_fd */ - { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_NULL }, /* 373 = extattr_delete_fd */ + { SYF_MPSAFE | AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_NULL }, /* 371 = extattr_set_fd */ + { SYF_MPSAFE | AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_NULL }, /* 372 = extattr_get_fd */ + { SYF_MPSAFE | AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_NULL }, /* 373 = extattr_delete_fd */ { SYF_MPSAFE | AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL }, /* 374 = __setugid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 375 = nfsclnt */ { SYF_MPSAFE | AS(eaccess_args), (sy_call_t *)eaccess, AUE_NULL }, /* 376 = eaccess */ ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/syscalls.master#2 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.65 2006/03/30 07:42:32 ps Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.66 2006/06/26 18:35:57 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -251,9 +251,9 @@ 134 AUE_SHUTDOWN MNOPROTO { int shutdown(int s, int how); } 135 AUE_SOCKETPAIR MNOPROTO { int socketpair(int domain, int type, \ int protocol, int *rsv); } -136 AUE_MKDIR NOPROTO { int mkdir(char *path, int mode); } -137 AUE_RMDIR NOPROTO { int rmdir(char *path); } -138 AUE_UTIMES STD { int freebsd32_utimes(char *path, \ +136 AUE_MKDIR MNOPROTO { int mkdir(char *path, int mode); } +137 AUE_RMDIR MNOPROTO { int rmdir(char *path); } +138 AUE_UTIMES MSTD { int freebsd32_utimes(char *path, \ struct timeval32 *tptr); } 139 AUE_NULL OBSOL 4.2 sigreturn 140 AUE_ADJTIME MSTD { int freebsd32_adjtime( \ @@ -601,16 +601,16 @@ acl_type_t type, struct acl *aclp); } 354 AUE_NULL MNOPROTO { int __acl_aclcheck_fd(int filedes, \ acl_type_t type, struct acl *aclp); } -355 AUE_NULL NOPROTO { int extattrctl(const char *path, int cmd, \ +355 AUE_NULL MNOPROTO { int extattrctl(const char *path, int cmd, \ const char *filename, int attrnamespace, \ const char *attrname); } -356 AUE_NULL NOPROTO { int extattr_set_file(const char *path, \ +356 AUE_NULL MNOPROTO { int extattr_set_file(const char *path, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } -357 AUE_NULL NOPROTO { ssize_t extattr_get_file(const char *path, \ +357 AUE_NULL MNOPROTO { ssize_t extattr_get_file(const char *path, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } -358 AUE_NULL NOPROTO { int extattr_delete_file(const char *path, \ +358 AUE_NULL MNOPROTO { int extattr_delete_file(const char *path, \ int attrnamespace, \ const char *attrname); } 359 AUE_NULL UNIMPL aio_waitcomplete @@ -631,13 +631,13 @@ 368 AUE_NULL UNIMPL __cap_set_fd 369 AUE_NULL UNIMPL __cap_set_file 370 AUE_NULL UNIMPL lkmressys -371 AUE_NULL NOPROTO { int extattr_set_fd(int fd, \ +371 AUE_NULL MNOPROTO { int extattr_set_fd(int fd, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } -372 AUE_NULL NOPROTO { ssize_t extattr_get_fd(int fd, \ +372 AUE_NULL MNOPROTO { ssize_t extattr_get_fd(int fd, \ int attrnamespace, const char *attrname, \ void *data, size_t nbytes); } -373 AUE_NULL NOPROTO { int extattr_delete_fd(int fd, \ +373 AUE_NULL MNOPROTO { int extattr_delete_fd(int fd, \ int attrnamespace, \ const char *attrname); } 374 AUE_NULL MNOPROTO { int __setugid(int flag); } ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.178 2006/05/10 20:38:16 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.179 2006/06/23 18:49:38 netchild Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -661,20 +661,22 @@ printf(ARGS(times, "*")); #endif - p = td->td_proc; - PROC_LOCK(p); - calcru(p, &utime, &stime); - calccru(p, &cutime, &cstime); - PROC_UNLOCK(p); + if (args->buf != NULL) { + p = td->td_proc; + PROC_LOCK(p); + calcru(p, &utime, &stime); + calccru(p, &cutime, &cstime); + PROC_UNLOCK(p); - tms.tms_utime = CONVTCK(utime); - tms.tms_stime = CONVTCK(stime); + tms.tms_utime = CONVTCK(utime); + tms.tms_stime = CONVTCK(stime); - tms.tms_cutime = CONVTCK(cutime); - tms.tms_cstime = CONVTCK(cstime); + tms.tms_cutime = CONVTCK(cutime); + tms.tms_cstime = CONVTCK(cstime); - if ((error = copyout(&tms, args->buf, sizeof(tms)))) - return error; + if ((error = copyout(&tms, args->buf, sizeof(tms)))) + return error; + } microuptime(&tv); td->td_retval[0] = (int)CONVTCK(tv); ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/ndis/kern_ndis.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.91 2005/11/02 18:01:04 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.92 2006/06/22 13:11:36 dds Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -405,13 +405,16 @@ cfg->ndis_oid = #if __FreeBSD_version < 502113 SYSCTL_ADD_STRING(&sc->ndis_ctx, SYSCTL_CHILDREN(sc->ndis_tree), + OID_AUTO, cfg->ndis_cfg.nc_cfgkey, flag, + cfg->ndis_cfg.nc_val, sizeof(cfg->ndis_cfg.nc_val), + cfg->ndis_cfg.nc_cfgdesc); #else SYSCTL_ADD_STRING(device_get_sysctl_ctx(sc->ndis_dev), SYSCTL_CHILDREN(device_get_sysctl_tree(sc->ndis_dev)), -#endif OID_AUTO, cfg->ndis_cfg.nc_cfgkey, flag, cfg->ndis_cfg.nc_val, sizeof(cfg->ndis_cfg.nc_val), cfg->ndis_cfg.nc_cfgdesc); +#endif return(0); } ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_misc.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.84 2006/02/06 22:06:53 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.85 2006/06/26 18:36:57 jhb Exp $"); #include "opt_mac.h" @@ -792,58 +792,10 @@ struct thread *td; struct svr4_sys_break_args *uap; { - struct proc *p = td->td_proc; - struct vmspace *vm = p->p_vmspace; - vm_offset_t new, old, base, ns; - int rv; + struct obreak_args ap; - base = round_page((vm_offset_t) vm->vm_daddr); - ns = (vm_offset_t)uap->nsize; - new = round_page(ns); - if (new > base) { - PROC_LOCK(p); - if ((new - base) > (unsigned)lim_cur(p, RLIMIT_DATA)) { - PROC_UNLOCK(p); - return ENOMEM; - } - PROC_UNLOCK(p); - if (new >= VM_MAXUSER_ADDRESS) - return (ENOMEM); - } else if (new < base) { - /* - * This is simply an invalid value. If someone wants to - * do fancy address space manipulations, mmap and munmap - * can do most of what the user would want. - */ - return EINVAL; - } - - old = base + ctob(vm->vm_dsize); - - if (new > old) { - vm_size_t diff; - diff = new - old; - PROC_LOCK(p); - if (vm->vm_map.size + diff > lim_cur(p, RLIMIT_VMEM)) { - PROC_UNLOCK(p); - return(ENOMEM); - } - PROC_UNLOCK(p); - rv = vm_map_find(&vm->vm_map, NULL, 0, &old, diff, FALSE, - VM_PROT_ALL, VM_PROT_ALL, 0); - if (rv != KERN_SUCCESS) { - return (ENOMEM); - } - vm->vm_dsize += btoc(diff); - } else if (new < old) { - rv = vm_map_remove(&vm->vm_map, new, old); - if (rv != KERN_SUCCESS) { - return (ENOMEM); - } - vm->vm_dsize -= btoc(old - new); - } - - return (0); + ap.nsize = uap->nsize; + return (obreak(td, &ap)); } static __inline clock_t ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_proto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.19 2005/07/13 20:35:08 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.20 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp */ #ifndef _SVR4_SYSPROTO_H_ ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.17 2005/07/13 20:35:08 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.18 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp */ #define SVR4_SYS_exit 1 ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_syscallnames.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.17 2005/07/13 20:35:08 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.18 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp */ const char *svr4_syscallnames[] = { ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.18 2005/07/13 20:35:08 jhb Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.19 2006/06/26 18:37:36 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp */ #include <bsm/audit_kevents.h> @@ -37,7 +37,7 @@ { SYF_MPSAFE | AS(svr4_sys_mknod_args), (sy_call_t *)svr4_sys_mknod, AUE_NULL }, /* 14 = svr4_sys_mknod */ { SYF_MPSAFE | AS(chmod_args), (sy_call_t *)chmod, AUE_NULL }, /* 15 = chmod */ { SYF_MPSAFE | AS(chown_args), (sy_call_t *)chown, AUE_NULL }, /* 16 = chown */ - { AS(svr4_sys_break_args), (sy_call_t *)svr4_sys_break, AUE_NULL }, /* 17 = svr4_sys_break */ + { SYF_MPSAFE | AS(svr4_sys_break_args), (sy_call_t *)svr4_sys_break, AUE_NULL }, /* 17 = svr4_sys_break */ { SYF_MPSAFE | AS(svr4_sys_stat_args), (sy_call_t *)svr4_sys_stat, AUE_NULL }, /* 18 = svr4_sys_stat */ { SYF_MPSAFE | AS(lseek_args), (sy_call_t *)lseek, AUE_NULL }, /* 19 = lseek */ { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_NULL }, /* 20 = getpid */ ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/syscalls.master#2 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.19 2005/07/13 20:32:42 jhb Exp $ + $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.20 2006/06/26 18:36:57 jhb Exp $ ; from: @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; ; System call name/number master file (or rather, slave, from SVR4). @@ -57,7 +57,7 @@ 14 AUE_NULL MSTD { int svr4_sys_mknod(char* path, int mode, int dev); } 15 AUE_NULL MNOPROTO { int chmod(char *path, int mode); } 16 AUE_NULL MNOPROTO { int chown(char *path, uid_t uid, gid_t gid); } -17 AUE_NULL STD { int svr4_sys_break(caddr_t nsize); } +17 AUE_NULL MSTD { int svr4_sys_break(caddr_t nsize); } 18 AUE_NULL MSTD { int svr4_sys_stat(char* path, \ struct svr4_stat* ub); } 19 AUE_NULL MNOPROTO { int lseek(int filedes, off_t *offset, \ ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/NOTES#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1367 2006/06/19 22:11:44 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1369 2006/06/26 22:03:21 babkin Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/files#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1125 2006/06/14 03:03:08 marcel Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1126 2006/06/26 22:30:07 thompsa Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1459,6 +1459,7 @@ net/if_clone.c standard net/if_disc.c optional disc net/if_ef.c optional ef +net/if_enc.c optional enc net/if_ethersubr.c optional ether net/if_faith.c optional faith net/if_fddisubr.c optional fddi ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/files.amd64#2 (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.amd64,v 1.89 2006/05/18 23:30:47 ambrisko Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.90 2006/06/26 23:41:06 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -177,6 +177,7 @@ dev/hwpmc/hwpmc_x86.c optional hwpmc dev/kbd/kbd.c optional atkbd | sc | ukbd dev/mem/memutil.c optional mem +dev/nfe/if_nfe.c optional nfe pci dev/nve/if_nve.c optional nve pci dev/rr232x/os_bsd.c optional rr232x dev/rr232x/osm_bsd.c optional rr232x ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/files.i386#2 (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.i386,v 1.561 2006/05/17 21:25:22 marius Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.562 2006/06/26 23:41:07 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -198,6 +198,7 @@ dev/mem/memutil.c optional mem dev/mse/mse.c optional mse dev/mse/mse_isa.c optional mse isa +dev/nfe/if_nfe.c optional nfe pci dev/nve/if_nve.c optional nve pci dev/pcf/pcf_isa.c optional pcf dev/random/nehemiah.c optional random ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/options#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.546 2006/06/13 13:12:55 davidxu Exp $ +# $FreeBSD: src/sys/conf/options,v 1.549 2006/06/26 22:30:07 thompsa Exp $ # # On the handling of kernel options # @@ -340,6 +340,7 @@ BOOTP_NFSV3 opt_bootp.h BOOTP_WIRED_TO opt_bootp.h DEVICE_POLLING +DEV_ENC opt_enc.h DEV_PF opt_pf.h DEV_PFLOG opt_pf.h DEV_PFSYNC opt_pf.h ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/acpica/acpi_dock.c#2 (text) ==== @@ -23,25 +23,20 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_dock.c,v 1.2 2006/04/16 15:35:12 maxim Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_dock.c,v 1.3 2006/06/22 06:34:05 njl Exp $ */ #include "opt_acpi.h" #include <sys/param.h> +#include <sys/bus.h> #include <sys/kernel.h> -#include <sys/bus.h> - -#include <sys/kdb.h> - -#include <machine/bus.h> #include <sys/module.h> #include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/acnamesp.h> #include <dev/acpica/acpivar.h> #include <dev/acpica/acpiio.h> -#include <contrib/dev/acpica/acnamesp.h> - /* Hooks for the ACPI CA debugging infrastructure */ #define _COMPONENT ACPI_DOCK ACPI_MODULE_NAME("DOCK") @@ -56,6 +51,10 @@ #define ACPI_DOCK_STATUS_UNDOCKED 0 #define ACPI_DOCK_STATUS_DOCKED 1 +/* Prevent the device from being removed or not. */ +#define ACPI_DOCK_UNLOCK 0 +#define ACPI_DOCK_LOCK 1 + struct acpi_dock_softc { int _sta; int _bdn; @@ -68,10 +67,10 @@ /* Global docking status, for avoiding duplicated docking */ static int acpi_dock_status = ACPI_DOCK_STATUS_UNKNOWN; -ACPI_SERIAL_DECL(dock, "ACPI Dock Station"); +ACPI_SERIAL_DECL(dock, "ACPI Docking Station"); /* - * Utility + * Utility functions */ static void @@ -83,23 +82,15 @@ sc = device_get_softc(dev); h = acpi_get_handle(dev); - if (ACPI_FAILURE(acpi_GetInteger(h, "_STA", &sc->_sta))) { + if (ACPI_FAILURE(acpi_GetInteger(h, "_STA", &sc->_sta))) sc->_sta = ACPI_DOCK_STATUS_UNKNOWN; - } - ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), - "_STA = %04x\n", sc->_sta); - - if (ACPI_FAILURE(acpi_GetInteger(h, "_BDN", &sc->_bdn))) { + if (ACPI_FAILURE(acpi_GetInteger(h, "_BDN", &sc->_bdn))) sc->_bdn = ACPI_DOCK_STATUS_UNKNOWN; - } - ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), - "_BDN = %04x\n", sc->_bdn); - - if (ACPI_FAILURE(acpi_GetInteger(h, "_UID", &sc->_uid))) { + if (ACPI_FAILURE(acpi_GetInteger(h, "_UID", &sc->_uid))) sc->_uid = ACPI_DOCK_STATUS_UNKNOWN; - } ACPI_VPRINT(dev, acpi_device_get_parent_softc(dev), - "_UID = %04x\n", sc->_uid); + "_STA: %04x, _BDN: %04x, _UID: %04x\n", sc->_sta, + sc->_bdn, sc->_uid); } static int @@ -122,23 +113,21 @@ buf.Length = sizeof(retobj); status = AcpiEvaluateObject(h, "_DCK", &args, &buf); - if (dock == ACPI_DOCK_STATUS_UNDOCKED) { - /* - * When _DCK is called with 0, OSPM will ignore the return value. - */ + /* + * When _DCK is called with 0, OSPM will ignore the return value. + */ + if (dock == ACPI_DOCK_STATUS_UNDOCKED) return (0); - } - if (ACPI_SUCCESS(status)) { - if (retobj.Type == ACPI_TYPE_INTEGER && - retobj.Integer.Value == 1) { - return (0); - } - } + /* If _DCK returned 1, the request succeeded. */ + if (ACPI_SUCCESS(status) && retobj.Type == ACPI_TYPE_INTEGER && + retobj.Integer.Value == 1) + return (0); return (-1); } +/* Lock devices while docked. */ static void acpi_dock_execute_lck(device_t dev, int lock) { @@ -158,10 +147,8 @@ h = acpi_get_handle(dev); snprintf(ejx, sizeof(ejx), "_EJ%d", state); status = acpi_SetInteger(h, ejx, eject); - - if (ACPI_SUCCESS(status)) { + if (ACPI_SUCCESS(status)) return (0); - } return (-1); } @@ -179,17 +166,12 @@ ejd_buffer.Pointer = NULL; ejd_buffer.Length = ACPI_ALLOCATE_BUFFER; ret_status = AcpiEvaluateObject(handle, "_EJD", NULL, &ejd_buffer); - - if (ACPI_FAILURE(ret_status)) { + if (ACPI_FAILURE(ret_status)) goto out; - } obj = (ACPI_OBJECT *)ejd_buffer.Pointer; - if (dock_handle != acpi_GetReference(NULL, obj)) { - goto out; - } - - ret = 1; + if (dock_handle == acpi_GetReference(NULL, obj)) + ret = 1; out: if (ejd_buffer.Pointer != NULL) @@ -199,7 +181,7 @@ } /* - * Dock + * Docking functions */ static void @@ -209,9 +191,8 @@ dev = (device_t)context; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606271008.k5RA8JVx019564>