| linux_misc.c (180766) | linux_misc.c (181803) |
|---|---|
| 1/*- 2 * Copyright (c) 2002 Doug Rabson 3 * Copyright (c) 1994-1995 S�ren Schmidt 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 14 unchanged lines hidden (view full) --- 23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 */ 29 30#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2002 Doug Rabson 3 * Copyright (c) 1994-1995 S�ren Schmidt 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 14 unchanged lines hidden (view full) --- 23 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 */ 29 30#include <sys/cdefs.h> |
| 31__FBSDID("$FreeBSD: head/sys/compat/linux/linux_misc.c 180766 2008-07-23 17:19:02Z rdivacky $"); | 31__FBSDID("$FreeBSD: head/sys/compat/linux/linux_misc.c 181803 2008-08-17 23:27:27Z bz $"); |
| 32 33#include "opt_compat.h" 34#include "opt_mac.h" 35 36#include <sys/param.h> 37#include <sys/blist.h> 38#include <sys/fcntl.h> 39#if defined(__i386__) --- 19 unchanged lines hidden (view full) --- 59#include <sys/sysctl.h> 60#include <sys/sysproto.h> 61#include <sys/systm.h> 62#include <sys/time.h> 63#include <sys/vmmeter.h> 64#include <sys/vnode.h> 65#include <sys/wait.h> 66#include <sys/cpuset.h> | 32 33#include "opt_compat.h" 34#include "opt_mac.h" 35 36#include <sys/param.h> 37#include <sys/blist.h> 38#include <sys/fcntl.h> 39#if defined(__i386__) --- 19 unchanged lines hidden (view full) --- 59#include <sys/sysctl.h> 60#include <sys/sysproto.h> 61#include <sys/systm.h> 62#include <sys/time.h> 63#include <sys/vmmeter.h> 64#include <sys/vnode.h> 65#include <sys/wait.h> 66#include <sys/cpuset.h> |
| 67#include <sys/vimage.h> |
|
| 67 68#include <security/mac/mac_framework.h> 69 70#include <vm/vm.h> 71#include <vm/pmap.h> 72#include <vm/vm_kern.h> 73#include <vm/vm_map.h> 74#include <vm/vm_extern.h> --- 685 unchanged lines hidden (view full) --- 760 strlcpy(utsname.machine, "i686", LINUX_MAX_UTSNAME); 761#else 762 strlcpy(utsname.machine, "x86_64", LINUX_MAX_UTSNAME); 763#endif /* COMPAT_LINUX32 */ 764#else /* something other than i386 or amd64 - assume we and Linux agree */ 765 strlcpy(utsname.machine, machine, LINUX_MAX_UTSNAME); 766#endif /* __i386__ */ 767 mtx_lock(&hostname_mtx); | 68 69#include <security/mac/mac_framework.h> 70 71#include <vm/vm.h> 72#include <vm/pmap.h> 73#include <vm/vm_kern.h> 74#include <vm/vm_map.h> 75#include <vm/vm_extern.h> --- 685 unchanged lines hidden (view full) --- 761 strlcpy(utsname.machine, "i686", LINUX_MAX_UTSNAME); 762#else 763 strlcpy(utsname.machine, "x86_64", LINUX_MAX_UTSNAME); 764#endif /* COMPAT_LINUX32 */ 765#else /* something other than i386 or amd64 - assume we and Linux agree */ 766 strlcpy(utsname.machine, machine, LINUX_MAX_UTSNAME); 767#endif /* __i386__ */ 768 mtx_lock(&hostname_mtx); |
| 768 strlcpy(utsname.domainname, domainname, LINUX_MAX_UTSNAME); | 769 strlcpy(utsname.domainname, V_domainname, LINUX_MAX_UTSNAME); |
| 769 mtx_unlock(&hostname_mtx); 770 771 return (copyout(&utsname, args->buf, sizeof(utsname))); 772} 773 774#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) 775struct l_utimbuf { 776 l_time_t l_actime; --- 1094 unchanged lines hidden --- | 770 mtx_unlock(&hostname_mtx); 771 772 return (copyout(&utsname, args->buf, sizeof(utsname))); 773} 774 775#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) 776struct l_utimbuf { 777 l_time_t l_actime; --- 1094 unchanged lines hidden --- |