Date: Tue, 11 Jan 2011 18:52:29 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 187700 for review Message-ID: <201101111852.p0BIqTpK045257@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@187700?ac=10 Change 187700 by jhb@jhb_jhbbsd on 2011/01/11 18:51:37 IFC @187699 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#21 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#102 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#32 integrate .. //depot/projects/smpng/sys/amd64/include/_inttypes.h#3 integrate .. //depot/projects/smpng/sys/amd64/include/_limits.h#7 integrate .. //depot/projects/smpng/sys/amd64/include/_stdint.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/vmparam.h#18 integrate .. //depot/projects/smpng/sys/arm/econa/ehci_ebus.c#2 integrate .. //depot/projects/smpng/sys/arm/econa/ohci_ec.c#2 integrate .. //depot/projects/smpng/sys/arm/include/_limits.h#8 integrate .. //depot/projects/smpng/sys/arm/include/_stdint.h#4 integrate .. //depot/projects/smpng/sys/arm/include/_types.h#9 integrate .. //depot/projects/smpng/sys/arm/include/vmparam.h#14 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#40 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#73 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#29 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_util.h#6 integrate .. //depot/projects/smpng/sys/conf/Makefile.mips#5 integrate .. //depot/projects/smpng/sys/contrib/octeon-sdk/cvmx-helper-board.c#6 integrate .. //depot/projects/smpng/sys/contrib/octeon-sdk/cvmx-mgmt-port.c#3 integrate .. //depot/projects/smpng/sys/contrib/octeon-sdk/cvmx-mgmt-port.h#3 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdInterrupt.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#37 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#78 integrate .. //depot/projects/smpng/sys/dev/ahci/ahci.c#15 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#121 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#68 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#22 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.h#14 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixv.h#2 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#41 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#86 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#39 integrate .. //depot/projects/smpng/sys/dev/usb/controller/at91dci.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/controller/at91dci_atmelarm.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci_atmelarm.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/controller/avr32dci.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci_ixp4xx.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci_mv.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/controller/musb_otg.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/controller/musb_otg_atmelarm.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci_atmelarm.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci_s3c24x0.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uhci.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uhci_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/controller/usb_controller.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uss820dci.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uss820dci_atmelarm.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/controller/xhci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/controller/xhci_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/input/uhid.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/input/ukbd.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/input/ums.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/misc/udbp.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/misc/ufm.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cue.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_ipheth.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_kue.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_rue.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_udav.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uark.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubsa.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubser.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uchcom.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ucycom.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ufoma.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ugensa.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uipaq.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ulpt.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umct.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umodem.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umoscom.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uplcom.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/serial/usb_serial.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uslcom.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uvisor.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uvscom.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/storage/umass.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/storage/urio.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/storage/ustorage_fs.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template_cdce.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template_msc.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template_mtp.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_busdma.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/usb_core.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_debug.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dev.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.c#27 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dynamic.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/usb_error.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/usb_generic.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/usb_handle_request.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hid.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hub.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/usb_lookup.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_mbuf.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_msctest.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/usb_parse.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/usb_process.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/usb_request.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/usb_transfer.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/usb_util.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#164 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdport.c#17 integrate .. //depot/projects/smpng/sys/geom/nop/g_nop.c#11 integrate .. //depot/projects/smpng/sys/geom/part/g_part_gpt.c#19 integrate .. //depot/projects/smpng/sys/i386/include/_inttypes.h#4 integrate .. //depot/projects/smpng/sys/i386/include/_limits.h#8 integrate .. //depot/projects/smpng/sys/i386/include/_stdint.h#3 integrate .. //depot/projects/smpng/sys/i386/include/_types.h#13 integrate .. //depot/projects/smpng/sys/i386/include/vmparam.h#17 integrate .. //depot/projects/smpng/sys/ia64/acpica/OsdEnvironment.c#13 integrate .. //depot/projects/smpng/sys/ia64/include/_limits.h#8 integrate .. //depot/projects/smpng/sys/ia64/include/_stdint.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/float.h#9 integrate .. //depot/projects/smpng/sys/ia64/include/vmparam.h#20 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#75 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#136 integrate .. //depot/projects/smpng/sys/kern/kern_hhook.c#2 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#84 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#53 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#112 integrate .. //depot/projects/smpng/sys/kern/subr_clock.c#13 integrate .. //depot/projects/smpng/sys/kern/subr_lock.c#18 integrate .. //depot/projects/smpng/sys/kern/subr_pcpu.c#19 integrate .. //depot/projects/smpng/sys/kern/vfs_mountroot.c#3 integrate .. //depot/projects/smpng/sys/mips/atheros/ar91xxreg.h#2 integrate .. //depot/projects/smpng/sys/mips/cavium/ciu.c#4 integrate .. //depot/projects/smpng/sys/mips/cavium/cvmx_config.h#2 integrate .. //depot/projects/smpng/sys/mips/cavium/files.octeon1#7 integrate .. //depot/projects/smpng/sys/mips/cavium/if_octm.c#1 branch .. //depot/projects/smpng/sys/mips/cavium/octe/ethernet-defines.h#3 integrate .. //depot/projects/smpng/sys/mips/cavium/octe/ethernet-rx.c#4 integrate .. //depot/projects/smpng/sys/mips/cavium/octe/ethernet-tx.c#4 integrate .. //depot/projects/smpng/sys/mips/cavium/octe/ethernet.c#5 integrate .. //depot/projects/smpng/sys/mips/cavium/octeon_wdog.c#2 integrate .. //depot/projects/smpng/sys/mips/cavium/octopci.c#6 integrate .. //depot/projects/smpng/sys/mips/cavium/usb/octusb.c#3 integrate .. //depot/projects/smpng/sys/mips/cavium/usb/octusb_octeon.c#2 integrate .. //depot/projects/smpng/sys/mips/conf/OCTEON1#7 integrate .. //depot/projects/smpng/sys/mips/include/_inttypes.h#4 integrate .. //depot/projects/smpng/sys/mips/include/_limits.h#3 integrate .. //depot/projects/smpng/sys/mips/include/_stdint.h#3 integrate .. //depot/projects/smpng/sys/mips/include/_types.h#3 integrate .. //depot/projects/smpng/sys/mips/include/vmparam.h#9 integrate .. //depot/projects/smpng/sys/mips/rmi/xls_ehci.c#2 integrate .. //depot/projects/smpng/sys/net/vnet.c#10 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#28 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#15 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#87 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#107 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_dummynet.c#12 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#139 integrate .. //depot/projects/smpng/sys/netinet/tcp_lro.c#3 integrate .. //depot/projects/smpng/sys/netinet/tcp_lro.h#2 integrate .. //depot/projects/smpng/sys/netinet/tcp_reass.c#17 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.h#8 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#54 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#88 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#81 integrate .. //depot/projects/smpng/sys/netinet/udp.h#6 integrate .. //depot/projects/smpng/sys/netinet/udp_var.h#19 integrate .. //depot/projects/smpng/sys/netsmb/smb_dev.h#5 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.c#19 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.h#17 integrate .. //depot/projects/smpng/sys/pc98/include/_inttypes.h#2 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#58 integrate .. //depot/projects/smpng/sys/powerpc/include/_inttypes.h#5 integrate .. //depot/projects/smpng/sys/powerpc/include/_limits.h#9 integrate .. //depot/projects/smpng/sys/powerpc/include/_stdint.h#4 integrate .. //depot/projects/smpng/sys/powerpc/include/_types.h#7 integrate .. //depot/projects/smpng/sys/powerpc/include/float.h#10 integrate .. //depot/projects/smpng/sys/powerpc/include/vmparam.h#17 integrate .. //depot/projects/smpng/sys/powerpc/ps3/ehci_ps3.c#2 integrate .. //depot/projects/smpng/sys/rpc/clnt_dg.c#10 integrate .. //depot/projects/smpng/sys/rpc/clnt_vc.c#11 integrate .. //depot/projects/smpng/sys/rpc/svc_vc.c#8 integrate .. //depot/projects/smpng/sys/sparc64/include/_limits.h#7 integrate .. //depot/projects/smpng/sys/sparc64/include/_stdint.h#3 integrate .. //depot/projects/smpng/sys/sparc64/include/float.h#7 integrate .. //depot/projects/smpng/sys/sparc64/include/vmparam.h#21 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#30 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tlb.c#13 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#30 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#58 integrate .. //depot/projects/smpng/sys/sun4v/include/_limits.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/_stdint.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/float.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/vmparam.h#8 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/db_interface.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/db_trace.c#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/vm_machdep.c#6 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#46 integrate .. //depot/projects/smpng/sys/sys/imgact.h#22 integrate .. //depot/projects/smpng/sys/sys/link_elf.h#8 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#68 integrate .. //depot/projects/smpng/sys/sys/sysent.h#39 integrate .. //depot/projects/smpng/sys/sys/vmmeter.h#11 integrate .. //depot/projects/smpng/sys/vm/phys_pager.c#21 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#57 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#73 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#39 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#118 integrate .. //depot/projects/smpng/sys/x86/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/smpng/sys/x86/include/_inttypes.h#1 branch Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#21 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.34 2010/05/23 18:32:02 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.35 2011/01/08 16:13:44 kib Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -75,11 +75,14 @@ .sv_setregs = exec_setregs, .sv_fixlimit = NULL, .sv_maxssiz = NULL, - .sv_flags = SV_ABI_FREEBSD | SV_LP64, + .sv_flags = SV_ABI_FREEBSD | SV_LP64 | SV_SHP, .sv_set_syscall_retval = cpu_set_syscall_retval, .sv_fetch_syscall_args = cpu_fetch_syscall_args, .sv_syscallnames = syscallnames, + .sv_shared_page_base = SHAREDPAGE, + .sv_shared_page_len = PAGE_SIZE, }; +INIT_SYSENTVEC(elf64_sysvec, &elf64_freebsd_sysvec); static Elf64_Brandinfo freebsd_brand_info = { .brand = ELFOSABI_FREEBSD, @@ -129,7 +132,6 @@ (sysinit_cfunc_t) elf64_insert_brand_entry, &kfreebsd_brand_info); - void elf64_dump_thread(struct thread *td __unused, void *dst __unused, size_t *off __unused) ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#102 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.736 2010/12/22 00:18:42 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.737 2011/01/08 16:13:44 kib Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -386,7 +386,7 @@ } regs->tf_rsp = (long)sfp; - regs->tf_rip = PS_STRINGS - *(p->p_sysent->sv_szsigcode); + regs->tf_rip = p->p_sysent->sv_sigcode_base; regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel; ==== //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#32 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.34 2010/12/22 00:18:42 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.35 2011/01/08 16:13:44 kib Exp $"); #include "opt_compat.h" @@ -393,7 +393,8 @@ } regs->tf_rsp = (uintptr_t)sfp; - regs->tf_rip = p->p_sysent->sv_psstrings - sz_freebsd4_ia32_sigcode; + regs->tf_rip = p->p_sysent->sv_sigcode_base + sz_ia32_sigcode - + sz_freebsd4_ia32_sigcode; regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucode32sel; regs->tf_ss = _udatasel; @@ -514,7 +515,7 @@ } regs->tf_rsp = (uintptr_t)sfp; - regs->tf_rip = p->p_sysent->sv_psstrings - *(p->p_sysent->sv_szsigcode); + regs->tf_rip = p->p_sysent->sv_sigcode_base; regs->tf_rflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucode32sel; regs->tf_ss = _udatasel; ==== //depot/projects/smpng/sys/amd64/include/_inttypes.h#3 (text+ko) ==== @@ -1,213 +1,6 @@ /*- - * Copyright (c) 2001 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Klaus Klein. - * - * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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. - * - * From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $ - * $FreeBSD: src/sys/amd64/include/_inttypes.h,v 1.4 2010/03/03 17:55:51 joel Exp $ + * This file is in the public domain. */ +/* $FreeBSD: src/sys/amd64/include/_inttypes.h,v 1.5 2011/01/08 18:09:48 tijl Exp $ */ -#ifndef _MACHINE_INTTYPES_H_ -#define _MACHINE_INTTYPES_H_ - -/* - * Macros for format specifiers. - */ - -/* fprintf(3) macros for signed integers. */ - -#define PRId8 "d" /* int8_t */ -#define PRId16 "d" /* int16_t */ -#define PRId32 "d" /* int32_t */ -#define PRId64 "ld" /* int64_t */ -#define PRIdLEAST8 "d" /* int_least8_t */ -#define PRIdLEAST16 "d" /* int_least16_t */ -#define PRIdLEAST32 "d" /* int_least32_t */ -#define PRIdLEAST64 "ld" /* int_least64_t */ -#define PRIdFAST8 "d" /* int_fast8_t */ -#define PRIdFAST16 "d" /* int_fast16_t */ -#define PRIdFAST32 "d" /* int_fast32_t */ -#define PRIdFAST64 "ld" /* int_fast64_t */ -#define PRIdMAX "jd" /* intmax_t */ -#define PRIdPTR "ld" /* intptr_t */ - -#define PRIi8 "i" /* int8_t */ -#define PRIi16 "i" /* int16_t */ -#define PRIi32 "i" /* int32_t */ -#define PRIi64 "li" /* int64_t */ -#define PRIiLEAST8 "i" /* int_least8_t */ -#define PRIiLEAST16 "i" /* int_least16_t */ -#define PRIiLEAST32 "i" /* int_least32_t */ -#define PRIiLEAST64 "li" /* int_least64_t */ -#define PRIiFAST8 "i" /* int_fast8_t */ -#define PRIiFAST16 "i" /* int_fast16_t */ -#define PRIiFAST32 "i" /* int_fast32_t */ -#define PRIiFAST64 "li" /* int_fast64_t */ -#define PRIiMAX "ji" /* intmax_t */ -#define PRIiPTR "li" /* intptr_t */ - -/* fprintf(3) macros for unsigned integers. */ - -#define PRIo8 "o" /* uint8_t */ -#define PRIo16 "o" /* uint16_t */ -#define PRIo32 "o" /* uint32_t */ -#define PRIo64 "lo" /* uint64_t */ -#define PRIoLEAST8 "o" /* uint_least8_t */ -#define PRIoLEAST16 "o" /* uint_least16_t */ -#define PRIoLEAST32 "o" /* uint_least32_t */ -#define PRIoLEAST64 "lo" /* uint_least64_t */ -#define PRIoFAST8 "o" /* uint_fast8_t */ -#define PRIoFAST16 "o" /* uint_fast16_t */ -#define PRIoFAST32 "o" /* uint_fast32_t */ -#define PRIoFAST64 "lo" /* uint_fast64_t */ -#define PRIoMAX "jo" /* uintmax_t */ -#define PRIoPTR "lo" /* uintptr_t */ - -#define PRIu8 "u" /* uint8_t */ -#define PRIu16 "u" /* uint16_t */ -#define PRIu32 "u" /* uint32_t */ -#define PRIu64 "lu" /* uint64_t */ -#define PRIuLEAST8 "u" /* uint_least8_t */ -#define PRIuLEAST16 "u" /* uint_least16_t */ -#define PRIuLEAST32 "u" /* uint_least32_t */ -#define PRIuLEAST64 "lu" /* uint_least64_t */ -#define PRIuFAST8 "u" /* uint_fast8_t */ -#define PRIuFAST16 "u" /* uint_fast16_t */ -#define PRIuFAST32 "u" /* uint_fast32_t */ -#define PRIuFAST64 "lu" /* uint_fast64_t */ -#define PRIuMAX "ju" /* uintmax_t */ -#define PRIuPTR "lu" /* uintptr_t */ - -#define PRIx8 "x" /* uint8_t */ -#define PRIx16 "x" /* uint16_t */ -#define PRIx32 "x" /* uint32_t */ -#define PRIx64 "lx" /* uint64_t */ -#define PRIxLEAST8 "x" /* uint_least8_t */ -#define PRIxLEAST16 "x" /* uint_least16_t */ -#define PRIxLEAST32 "x" /* uint_least32_t */ -#define PRIxLEAST64 "lx" /* uint_least64_t */ -#define PRIxFAST8 "x" /* uint_fast8_t */ -#define PRIxFAST16 "x" /* uint_fast16_t */ -#define PRIxFAST32 "x" /* uint_fast32_t */ -#define PRIxFAST64 "lx" /* uint_fast64_t */ -#define PRIxMAX "jx" /* uintmax_t */ -#define PRIxPTR "lx" /* uintptr_t */ - -#define PRIX8 "X" /* uint8_t */ -#define PRIX16 "X" /* uint16_t */ -#define PRIX32 "X" /* uint32_t */ -#define PRIX64 "lX" /* uint64_t */ -#define PRIXLEAST8 "X" /* uint_least8_t */ -#define PRIXLEAST16 "X" /* uint_least16_t */ -#define PRIXLEAST32 "X" /* uint_least32_t */ -#define PRIXLEAST64 "lX" /* uint_least64_t */ -#define PRIXFAST8 "X" /* uint_fast8_t */ -#define PRIXFAST16 "X" /* uint_fast16_t */ -#define PRIXFAST32 "X" /* uint_fast32_t */ -#define PRIXFAST64 "lX" /* uint_fast64_t */ -#define PRIXMAX "jX" /* uintmax_t */ -#define PRIXPTR "lX" /* uintptr_t */ - -/* fscanf(3) macros for signed integers. */ - -#define SCNd8 "hhd" /* int8_t */ -#define SCNd16 "hd" /* int16_t */ -#define SCNd32 "d" /* int32_t */ -#define SCNd64 "ld" /* int64_t */ -#define SCNdLEAST8 "hhd" /* int_least8_t */ -#define SCNdLEAST16 "hd" /* int_least16_t */ -#define SCNdLEAST32 "d" /* int_least32_t */ -#define SCNdLEAST64 "ld" /* int_least64_t */ -#define SCNdFAST8 "d" /* int_fast8_t */ -#define SCNdFAST16 "d" /* int_fast16_t */ -#define SCNdFAST32 "d" /* int_fast32_t */ -#define SCNdFAST64 "ld" /* int_fast64_t */ -#define SCNdMAX "jd" /* intmax_t */ -#define SCNdPTR "ld" /* intptr_t */ - -#define SCNi8 "hhi" /* int8_t */ -#define SCNi16 "hi" /* int16_t */ -#define SCNi32 "i" /* int32_t */ -#define SCNi64 "li" /* int64_t */ -#define SCNiLEAST8 "hhi" /* int_least8_t */ -#define SCNiLEAST16 "hi" /* int_least16_t */ -#define SCNiLEAST32 "i" /* int_least32_t */ -#define SCNiLEAST64 "li" /* int_least64_t */ -#define SCNiFAST8 "i" /* int_fast8_t */ -#define SCNiFAST16 "i" /* int_fast16_t */ -#define SCNiFAST32 "i" /* int_fast32_t */ -#define SCNiFAST64 "li" /* int_fast64_t */ -#define SCNiMAX "ji" /* intmax_t */ -#define SCNiPTR "li" /* intptr_t */ - -/* fscanf(3) macros for unsigned integers. */ - -#define SCNo8 "hho" /* uint8_t */ -#define SCNo16 "ho" /* uint16_t */ -#define SCNo32 "o" /* uint32_t */ -#define SCNo64 "lo" /* uint64_t */ -#define SCNoLEAST8 "hho" /* uint_least8_t */ -#define SCNoLEAST16 "ho" /* uint_least16_t */ -#define SCNoLEAST32 "o" /* uint_least32_t */ -#define SCNoLEAST64 "lo" /* uint_least64_t */ -#define SCNoFAST8 "o" /* uint_fast8_t */ -#define SCNoFAST16 "o" /* uint_fast16_t */ -#define SCNoFAST32 "o" /* uint_fast32_t */ -#define SCNoFAST64 "lo" /* uint_fast64_t */ -#define SCNoMAX "jo" /* uintmax_t */ -#define SCNoPTR "lo" /* uintptr_t */ - -#define SCNu8 "hhu" /* uint8_t */ -#define SCNu16 "hu" /* uint16_t */ -#define SCNu32 "u" /* uint32_t */ -#define SCNu64 "lu" /* uint64_t */ -#define SCNuLEAST8 "hhu" /* uint_least8_t */ -#define SCNuLEAST16 "hu" /* uint_least16_t */ -#define SCNuLEAST32 "u" /* uint_least32_t */ -#define SCNuLEAST64 "lu" /* uint_least64_t */ -#define SCNuFAST8 "u" /* uint_fast8_t */ -#define SCNuFAST16 "u" /* uint_fast16_t */ -#define SCNuFAST32 "u" /* uint_fast32_t */ -#define SCNuFAST64 "lu" /* uint_fast64_t */ -#define SCNuMAX "ju" /* uintmax_t */ -#define SCNuPTR "lu" /* uintptr_t */ - -#define SCNx8 "hhx" /* uint8_t */ -#define SCNx16 "hx" /* uint16_t */ -#define SCNx32 "x" /* uint32_t */ -#define SCNx64 "lx" /* uint64_t */ -#define SCNxLEAST8 "hhx" /* uint_least8_t */ -#define SCNxLEAST16 "hx" /* uint_least16_t */ -#define SCNxLEAST32 "x" /* uint_least32_t */ -#define SCNxLEAST64 "lx" /* uint_least64_t */ -#define SCNxFAST8 "x" /* uint_fast8_t */ -#define SCNxFAST16 "x" /* uint_fast16_t */ -#define SCNxFAST32 "x" /* uint_fast32_t */ -#define SCNxFAST64 "lx" /* uint_fast64_t */ -#define SCNxMAX "jx" /* uintmax_t */ -#define SCNxPTR "lx" /* uintptr_t */ - -#endif /* !_MACHINE_INTTYPES_H_ */ +#include <x86/_inttypes.h> ==== //depot/projects/smpng/sys/amd64/include/_limits.h#7 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/amd64/include/_limits.h,v 1.11 2005/08/20 16:44:40 stefanf Exp $ + * $FreeBSD: src/sys/amd64/include/_limits.h,v 1.12 2011/01/08 11:13:34 tijl Exp $ */ #ifndef _MACHINE__LIMITS_H_ @@ -40,8 +40,6 @@ * type converted according to the integral promotions. The subtraction for * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2). - * These numbers are for the default configuration of gcc. They work for - * some other compilers as well, but this should not be depended on. */ #define __CHAR_BIT 8 /* number of bits in a char */ @@ -49,19 +47,19 @@ #define __SCHAR_MAX 0x7f /* max value for a signed char */ #define __SCHAR_MIN (-0x7f - 1) /* min value for a signed char */ -#define __UCHAR_MAX 0xffU /* max value for an unsigned char */ +#define __UCHAR_MAX 0xff /* max value for an unsigned char */ -#define __USHRT_MAX 0xffffU /* max value for an unsigned short */ +#define __USHRT_MAX 0xffff /* max value for an unsigned short */ #define __SHRT_MAX 0x7fff /* max value for a short */ #define __SHRT_MIN (-0x7fff - 1) /* min value for a short */ -#define __UINT_MAX 0xffffffffU /* max value for an unsigned int */ +#define __UINT_MAX 0xffffffff /* max value for an unsigned int */ #define __INT_MAX 0x7fffffff /* max value for an int */ #define __INT_MIN (-0x7fffffff - 1) /* min value for an int */ -#define __ULONG_MAX 0xffffffffffffffffUL /* max for an unsigned long */ -#define __LONG_MAX 0x7fffffffffffffffL /* max for a long */ -#define __LONG_MIN (-0x7fffffffffffffffL - 1) /* min for a long */ +#define __ULONG_MAX 0xffffffffffffffff /* max for an unsigned long */ +#define __LONG_MAX 0x7fffffffffffffff /* max for a long */ +#define __LONG_MIN (-0x7fffffffffffffff - 1) /* min for a long */ /* max value for an unsigned long long */ #define __ULLONG_MAX 0xffffffffffffffffULL @@ -83,10 +81,7 @@ #define __LONG_BIT 64 #define __WORD_BIT 32 -/* - * Minimum signal stack size. The current signal frame - * for i386 is 408 bytes large. - */ +/* Minimum signal stack size. */ #define __MINSIGSTKSZ (512 * 4) #endif /* !_MACHINE__LIMITS_H_ */ ==== //depot/projects/smpng/sys/amd64/include/_stdint.h#4 (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/amd64/include/_stdint.h,v 1.3 2004/05/18 16:04:56 stefanf Exp $ + * $FreeBSD: src/sys/amd64/include/_stdint.h,v 1.4 2011/01/08 12:43:05 tijl Exp $ */ #ifndef _MACHINE__STDINT_H_ @@ -52,8 +52,8 @@ #define UINT32_C(c) (c ## U) #define UINT64_C(c) (c ## UL) -#define INTMAX_C(c) (c ## L) -#define UINTMAX_C(c) (c ## UL) +#define INTMAX_C(c) INT64_C(c) +#define UINTMAX_C(c) UINT64_C(c) #endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ ==== //depot/projects/smpng/sys/amd64/include/vmparam.h#18 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.63 2010/11/26 19:36:26 alc Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.65 2011/01/09 12:50:44 kib Exp $ */ @@ -70,17 +70,6 @@ #endif /* - * The time for a process to be blocked before being very swappable. - * This is a number of seconds which the system takes as being a non-trivial - * amount of real time. You probably shouldn't change this; - * it is used in subtle ways (fractions and multiples of it are, that is, like - * half of a ``long time'', almost a long time, etc.) - * It is related to human patience and other factors which don't really - * change over time. - */ -#define MAXSLP 20 - -/* * We provide a machine specific single page allocator through the use * of the direct mapped segment. This uses 2MB pages for reduced * TLB pressure. @@ -186,7 +175,8 @@ #define VM_MAXUSER_ADDRESS UVADDR(NUPML4E, 0, 0, 0) -#define USRSTACK VM_MAXUSER_ADDRESS +#define SHAREDPAGE (VM_MAXUSER_ADDRESS - PAGE_SIZE) +#define USRSTACK SHAREDPAGE #define VM_MAX_ADDRESS UPT_MAX_ADDRESS #define VM_MIN_ADDRESS (0) ==== //depot/projects/smpng/sys/arm/econa/ehci_ebus.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/econa/ehci_ebus.c,v 1.1 2010/01/04 03:35:45 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/econa/ehci_ebus.c,v 1.2 2011/01/11 13:59:06 jhb Exp $"); #include "opt_bus.h" @@ -46,7 +46,6 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/bus.h> -#include <sys/linker_set.h> #include <sys/module.h> #include <sys/lock.h> #include <sys/mutex.h> ==== //depot/projects/smpng/sys/arm/econa/ohci_ec.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/econa/ohci_ec.c,v 1.1 2010/01/04 03:35:45 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/econa/ohci_ec.c,v 1.2 2011/01/11 13:59:06 jhb Exp $"); #include <sys/stdint.h> #include <sys/stddef.h> @@ -34,7 +34,6 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/bus.h> -#include <sys/linker_set.h> #include <sys/module.h> #include <sys/lock.h> #include <sys/mutex.h> ==== //depot/projects/smpng/sys/arm/include/_limits.h#8 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/_limits.h,v 1.9 2005/08/20 16:44:40 stefanf Exp $ + * $FreeBSD: src/sys/arm/include/_limits.h,v 1.11 2011/01/08 11:13:34 tijl Exp $ */ #ifndef _MACHINE__LIMITS_H_ @@ -40,8 +40,6 @@ * type converted according to the integral promotions. The subtraction for * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2). - * These numbers are for the default configuration of gcc. They work for - * some other compilers as well, but this should not be depended on. */ #define __CHAR_BIT 8 /* number of bits in a char */ @@ -55,20 +53,13 @@ #define __SHRT_MAX 0x7fff /* max value for a short */ #define __SHRT_MIN (-0x7fff - 1) /* min value for a short */ -#define __UINT_MAX 0xffffffffU /* max value for an unsigned int */ +#define __UINT_MAX 0xffffffff /* max value for an unsigned int */ #define __INT_MAX 0x7fffffff /* max value for an int */ #define __INT_MIN (-0x7fffffff - 1) /* min value for an int */ -/* Bad hack for gcc configured to give 64-bit longs. */ -#ifdef _LARGE_LONG -#define __ULONG_MAX 0xffffffffffffffffUL -#define __LONG_MAX 0x7fffffffffffffffL -#define __LONG_MIN (-0x7fffffffffffffffL - 1) -#else #define __ULONG_MAX 0xffffffffUL /* max value for an unsigned long */ #define __LONG_MAX 0x7fffffffL /* max value for a long */ #define __LONG_MIN (-0x7fffffffL - 1) /* min value for a long */ -#endif /* max value for an unsigned long long */ #define __ULLONG_MAX 0xffffffffffffffffULL @@ -87,11 +78,7 @@ #define __QUAD_MAX __LLONG_MAX /* max value for a quad_t */ #define __QUAD_MIN __LLONG_MIN /* min value for a quad_t */ -#ifdef _LARGE_LONG -#define __LONG_BIT 64 -#else #define __LONG_BIT 32 -#endif #define __WORD_BIT 32 /* Minimum signal stack size. */ ==== //depot/projects/smpng/sys/arm/include/_stdint.h#4 (text+ko) ==== @@ -27,7 +27,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/_stdint.h,v 1.3 2010/02/16 21:59:17 imp Exp $ + * $FreeBSD: src/sys/arm/include/_stdint.h,v 1.4 2011/01/08 12:43:05 tijl Exp $ */ #ifndef _MACHINE__STDINT_H_ @@ -45,8 +45,8 @@ #define UINT32_C(c) (c ## U) #define UINT64_C(c) (c ## ULL) -#define INTMAX_C(c) (c ## LL) -#define UINTMAX_C(c) (c ## ULL) +#define INTMAX_C(c) INT64_C(c) +#define UINTMAX_C(c) UINT64_C(c) #endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */ ==== //depot/projects/smpng/sys/arm/include/_types.h#9 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/arm/include/_types.h,v 1.9 2006/05/15 00:17:27 cognet Exp $ + * $FreeBSD: src/sys/arm/include/_types.h,v 1.10 2011/01/08 11:47:55 tijl Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -52,16 +52,16 @@ typedef unsigned short __uint16_t; typedef int __int32_t; typedef unsigned int __uint32_t; - -#ifdef __GNUCLIKE_ATTRIBUTE_MODE_DI -typedef int __attribute__((__mode__(__DI__))) __int64_t; -typedef unsigned int __attribute__((__mode__(__DI__))) __uint64_t; -#else +#ifndef lint +__extension__ +#endif /* LONGLONG */ typedef long long __int64_t; +#ifndef lint +__extension__ +#endif /* LONGLONG */ typedef unsigned long long __uint64_t; -#endif /* * Standard type definitions. ==== //depot/projects/smpng/sys/arm/include/vmparam.h#14 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.15 2010/07/27 20:33:50 jhb Exp $ + * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.16 2011/01/09 12:50:44 kib Exp $ */ #ifndef _MACHINE_VMPARAM_H_ @@ -146,7 +146,6 @@ #define DFLSSIZ (2*1024*1024) #define MAXSSIZ (8*1024*1024) #define SGROWSIZ (128*1024) -#define MAXSLP 20 #ifdef ARM_USE_SMALL_ALLOC #define UMA_MD_SMALL_ALLOC ==== //depot/projects/smpng/sys/cam/cam_periph.c#40 (text+ko) ==== @@ -28,14 +28,13 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.92 2010/12/10 21:38:51 ken Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.93 2011/01/11 13:59:06 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/types.h> #include <sys/malloc.h> #include <sys/kernel.h> -#include <sys/linker_set.h> #include <sys/bio.h> #include <sys/lock.h> #include <sys/mutex.h> ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#73 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.116 2010/11/23 13:49:15 pluknet Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.117 2011/01/08 16:13:44 kib Exp $"); #include "opt_compat.h" #include "opt_inet.h" @@ -2546,7 +2546,10 @@ execpath_len = 0; arginfo = (struct freebsd32_ps_strings *)curproc->p_sysent-> sv_psstrings; - szsigcode = *(imgp->proc->p_sysent->sv_szsigcode); + if (imgp->proc->p_sysent->sv_sigcode_base == 0) + szsigcode = *(imgp->proc->p_sysent->sv_szsigcode); + else + szsigcode = 0; destp = (caddr_t)arginfo - szsigcode - SPARE_USRSPACE - roundup(execpath_len, sizeof(char *)) - roundup(sizeof(canary), sizeof(char *)) - @@ -2556,7 +2559,7 @@ /* * install sigcode */ - if (szsigcode) + if (szsigcode != 0) copyout(imgp->proc->p_sysent->sv_sigcode, ((caddr_t)arginfo - szsigcode), szsigcode); ==== //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#29 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.38 2010/05/23 18:32:02 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.39 2011/01/08 16:13:44 kib Exp $"); #include "opt_compat.h" @@ -129,7 +129,7 @@ .sv_minsigstksz = MINSIGSTKSZ, .sv_pagesize = IA32_PAGE_SIZE, .sv_minuser = 0, - .sv_maxuser = FREEBSD32_USRSTACK, + .sv_maxuser = FREEBSD32_MAXUSER, .sv_usrstack = FREEBSD32_USRSTACK, .sv_psstrings = FREEBSD32_PS_STRINGS, .sv_stackprot = VM_PROT_ALL, @@ -137,13 +137,21 @@ .sv_setregs = ia32_setregs, .sv_fixlimit = ia32_fixlimit, .sv_maxssiz = &ia32_maxssiz, - .sv_flags = SV_ABI_FREEBSD | SV_IA32 | SV_ILP32, + .sv_flags = SV_ABI_FREEBSD | SV_IA32 | SV_ILP32 | +#ifdef __amd64__ + SV_SHP +#else + 0 +#endif + , .sv_set_syscall_retval = ia32_set_syscall_retval, .sv_fetch_syscall_args = ia32_fetch_syscall_args, .sv_syscallnames = freebsd32_syscallnames, + .sv_shared_page_base = FREEBSD32_SHAREDPAGE, + .sv_shared_page_len = PAGE_SIZE, }; +INIT_SYSENTVEC(elf_ia32_sysvec, &ia32_freebsd_sysvec); - static Elf32_Brandinfo ia32_brand_info = { .brand = ELFOSABI_FREEBSD, .machine = EM_386, @@ -191,7 +199,6 @@ (sysinit_cfunc_t) elf32_insert_brand_entry, &kia32_brand_info); - void elf32_dump_thread(struct thread *td __unused, void *dst __unused, size_t *off __unused) ==== //depot/projects/smpng/sys/compat/ia32/ia32_util.h#6 (text+ko) ==== @@ -25,7 +25,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/compat/ia32/ia32_util.h,v 1.11 2010/11/23 12:47:15 kib Exp $ + * $FreeBSD: src/sys/compat/ia32/ia32_util.h,v 1.12 2011/01/08 16:13:44 kib Exp $ */ #ifndef _COMPAT_IA32_IA32_UTIL_H @@ -41,9 +41,13 @@ #include <sys/cdefs.h> #ifdef __ia64__ -#define FREEBSD32_USRSTACK ((1ul << 32) - IA32_PAGE_SIZE * 2) +#define FREEBSD32_MAXUSER ((1ul << 32) - IA32_PAGE_SIZE * 2) +#define FREEBSD32_SHAREDPAGE 0 +#define FREEBSD32_USRSTACK FREEBSD32_MAXUSER #else -#define FREEBSD32_USRSTACK ((1ul << 32) - IA32_PAGE_SIZE) +#define FREEBSD32_MAXUSER ((1ul << 32) - IA32_PAGE_SIZE) +#define FREEBSD32_SHAREDPAGE (FREEBSD32_MAXUSER - IA32_PAGE_SIZE) +#define FREEBSD32_USRSTACK FREEBSD32_SHAREDPAGE #endif #define IA32_PAGE_SIZE 4096 ==== //depot/projects/smpng/sys/conf/Makefile.mips#5 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile.mips -# $FreeBSD: src/sys/conf/Makefile.mips,v 1.6 2010/12/17 09:14:25 jchandra Exp $ +# $FreeBSD: src/sys/conf/Makefile.mips,v 1.7 2011/01/10 05:13:06 jchandra Exp $ # # Makefile for FreeBSD # @@ -86,7 +86,7 @@ ${KERNEL_KO}.tramp.noheader ${KERNEL_KO}.tramp.bin ${LDSCRIPT_NAME}: $S/conf/${LDSCRIPT_NAME} - cat $S/conf/${LDSCRIPT_NAME}|sed s/KERNLOADADDR/${KERNLOADADDR}/g \ + sed s/KERNLOADADDR/${KERNLOADADDR}/g $S/conf/${LDSCRIPT_NAME} \ > ${LDSCRIPT_NAME} %RULES ==== //depot/projects/smpng/sys/contrib/octeon-sdk/cvmx-helper-board.c#6 (text+ko) ==== @@ -272,6 +272,8 @@ return ipd_port - 16; return -1; case CVMX_BOARD_TYPE_CUST_LANNER_MR730: + if ((ipd_port >= CVMX_HELPER_BOARD_MGMT_IPD_PORT) && (ipd_port < (CVMX_HELPER_BOARD_MGMT_IPD_PORT + 2))) + return (ipd_port - CVMX_HELPER_BOARD_MGMT_IPD_PORT) + 0x81; if ((ipd_port >= 0) && (ipd_port < 4)) return ipd_port; return -1; ==== //depot/projects/smpng/sys/contrib/octeon-sdk/cvmx-mgmt-port.c#3 (text+ko) ==== @@ -112,7 +112,7 @@ * >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101111852.p0BIqTpK045257>