Date: Mon, 22 Feb 2016 22:21:53 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r295902 - in projects/clang380-import: bin/dd bin/sh contrib/binutils/bfd lib/libvmmapi share/man/man9 sys/amd64/amd64 sys/amd64/cloudabi64 sys/amd64/vmm sys/amd64/vmm/amd sys/arm/allwi... Message-ID: <201602222221.u1MMLrZP026272@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Mon Feb 22 22:21:53 2016 New Revision: 295902 URL: https://svnweb.freebsd.org/changeset/base/295902 Log: Merge ^/head r295845 through r295901. Added: projects/clang380-import/sys/riscv/riscv/stack_machdep.c - copied unchanged from r295901, head/sys/riscv/riscv/stack_machdep.c Modified: projects/clang380-import/bin/dd/args.c projects/clang380-import/bin/sh/alias.c projects/clang380-import/bin/sh/input.c projects/clang380-import/bin/sh/parser.c projects/clang380-import/contrib/binutils/bfd/elf.c projects/clang380-import/contrib/binutils/bfd/elf32-arm.c projects/clang380-import/lib/libvmmapi/vmmapi.c projects/clang380-import/share/man/man9/bios.9 projects/clang380-import/sys/amd64/amd64/minidump_machdep.c projects/clang380-import/sys/amd64/cloudabi64/cloudabi64_sysvec.c projects/clang380-import/sys/amd64/vmm/amd/npt.c projects/clang380-import/sys/amd64/vmm/amd/svm.c projects/clang380-import/sys/amd64/vmm/vmm.c projects/clang380-import/sys/arm/allwinner/a20/std.a20 projects/clang380-import/sys/arm/allwinner/std.a10 projects/clang380-import/sys/arm/altera/socfpga/std.socfpga projects/clang380-import/sys/arm/amlogic/aml8726/std.aml8726 projects/clang380-import/sys/arm/annapurna/alpine/alpine_machdep.c projects/clang380-import/sys/arm/annapurna/alpine/std.alpine projects/clang380-import/sys/arm/arm/debug_monitor.c projects/clang380-import/sys/arm/arm/genassym.c projects/clang380-import/sys/arm/arm/mp_machdep.c projects/clang380-import/sys/arm/arm/pmap-v6.c projects/clang380-import/sys/arm/arm/trap-v4.c projects/clang380-import/sys/arm/arm/trap-v6.c projects/clang380-import/sys/arm/broadcom/bcm2835/std.bcm2836 projects/clang380-import/sys/arm/conf/std.armv6 projects/clang380-import/sys/arm/freescale/imx/std.imx51 projects/clang380-import/sys/arm/freescale/imx/std.imx53 projects/clang380-import/sys/arm/freescale/imx/std.imx6 projects/clang380-import/sys/arm/freescale/vybrid/std.vybrid projects/clang380-import/sys/arm/mv/armadaxp/std.armadaxp projects/clang380-import/sys/arm/mv/mvvar.h projects/clang380-import/sys/arm/qemu/std.virt projects/clang380-import/sys/arm/rockchip/std.rk30xx projects/clang380-import/sys/arm/samsung/exynos/std.exynos5250 projects/clang380-import/sys/arm/samsung/exynos/std.exynos5420 projects/clang380-import/sys/arm/ti/am335x/std.am335x projects/clang380-import/sys/arm/ti/omap4/std.omap4 projects/clang380-import/sys/arm/xilinx/std.zynq7 projects/clang380-import/sys/arm64/arm64/debug_monitor.c projects/clang380-import/sys/arm64/arm64/minidump_machdep.c projects/clang380-import/sys/arm64/arm64/trap.c projects/clang380-import/sys/arm64/cloudabi64/cloudabi64_sysvec.c projects/clang380-import/sys/arm64/conf/GENERIC projects/clang380-import/sys/boot/efi/include/efilib.h projects/clang380-import/sys/boot/efi/libefi/time.c projects/clang380-import/sys/boot/uboot/lib/net.c projects/clang380-import/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c projects/clang380-import/sys/cddl/dev/dtrace/arm/dtrace_isa.c projects/clang380-import/sys/cddl/dev/dtrace/mips/dtrace_isa.c projects/clang380-import/sys/compat/linprocfs/linprocfs.c projects/clang380-import/sys/compat/linux/linux_util.h projects/clang380-import/sys/compat/linuxkpi/common/include/linux/dma-mapping.h projects/clang380-import/sys/compat/linuxkpi/common/include/linux/list.h projects/clang380-import/sys/compat/linuxkpi/common/src/linux_compat.c projects/clang380-import/sys/compat/linuxkpi/common/src/linux_pci.c projects/clang380-import/sys/compat/svr4/svr4_misc.c projects/clang380-import/sys/compat/svr4/svr4_util.h projects/clang380-import/sys/conf/files.riscv projects/clang380-import/sys/conf/kern.post.mk projects/clang380-import/sys/conf/options projects/clang380-import/sys/dev/altera/avgen/altera_avgen.c projects/clang380-import/sys/dev/altera/avgen/altera_avgen_fdt.c projects/clang380-import/sys/dev/altera/avgen/altera_avgen_nexus.c projects/clang380-import/sys/dev/ce/if_ce.c projects/clang380-import/sys/dev/cp/if_cp.c projects/clang380-import/sys/dev/drm/drmP.h projects/clang380-import/sys/dev/drm2/drmP.h projects/clang380-import/sys/dev/fb/machfb.c projects/clang380-import/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/clang380-import/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/clang380-import/sys/dev/isci/isci_oem_parameters.c projects/clang380-import/sys/dev/msk/if_msk.c projects/clang380-import/sys/dev/ntb/if_ntb/if_ntb.c projects/clang380-import/sys/dev/ntb/ntb_hw/ntb_hw.c projects/clang380-import/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c projects/clang380-import/sys/dev/pms/freebsd/driver/ini/src/osapi.c projects/clang380-import/sys/dev/rt/if_rt.c projects/clang380-import/sys/dev/rtwn/if_rtwn.c projects/clang380-import/sys/dev/siba/siba_pcib.c projects/clang380-import/sys/dev/sk/if_sk.c projects/clang380-import/sys/dev/usb/wlan/if_urtwn.c projects/clang380-import/sys/dev/usb/wlan/if_urtwnreg.h projects/clang380-import/sys/dev/usb/wlan/if_urtwnvar.h projects/clang380-import/sys/dev/vt/hw/efifb/efifb.c projects/clang380-import/sys/i386/bios/mca_machdep.c projects/clang380-import/sys/i386/i386/machdep.c projects/clang380-import/sys/i386/pci/pci_cfgreg.c projects/clang380-import/sys/kern/kern_environment.c projects/clang380-import/sys/mips/adm5120/admpci.c projects/clang380-import/sys/mips/atheros/ar71xx_fixup.c projects/clang380-import/sys/mips/atheros/ar71xx_pci.c projects/clang380-import/sys/mips/atheros/ar71xx_spi.c projects/clang380-import/sys/mips/atheros/ar724x_pci.c projects/clang380-import/sys/mips/atheros/if_arge.c projects/clang380-import/sys/mips/atheros/qca955x_pci.c projects/clang380-import/sys/mips/cavium/cvmx_config.h projects/clang380-import/sys/mips/cavium/octopci.c projects/clang380-import/sys/mips/idt/idtpci.c projects/clang380-import/sys/mips/malta/gt_pci.c projects/clang380-import/sys/mips/mips/minidump_machdep.c projects/clang380-import/sys/mips/mips/nexus.c projects/clang380-import/sys/mips/mips/stack_machdep.c projects/clang380-import/sys/mips/nlm/cms.c projects/clang380-import/sys/mips/nlm/dev/net/xlpge.c projects/clang380-import/sys/mips/nlm/xlp_simplebus.c projects/clang380-import/sys/mips/rmi/dev/nlge/if_nlge.c projects/clang380-import/sys/mips/rmi/fmn.c projects/clang380-import/sys/mips/rmi/iodi.c projects/clang380-import/sys/mips/rt305x/rt305x_pci.c projects/clang380-import/sys/mips/sibyte/sb_zbpci.c projects/clang380-import/sys/modules/usb/Makefile projects/clang380-import/sys/modules/usb/urtwn/Makefile projects/clang380-import/sys/powerpc/aim/slb.c projects/clang380-import/sys/powerpc/ofw/ofw_real.c projects/clang380-import/sys/powerpc/ofw/rtas.c projects/clang380-import/sys/powerpc/powermac/macgpio.c projects/clang380-import/sys/powerpc/powermac/macio.c projects/clang380-import/sys/powerpc/powermac/platform_powermac.c projects/clang380-import/sys/powerpc/powerpc/genassym.c projects/clang380-import/sys/powerpc/powerpc/trap.c projects/clang380-import/sys/powerpc/ps3/if_glc.c projects/clang380-import/sys/powerpc/ps3/platform_ps3.c projects/clang380-import/sys/powerpc/ps3/ps3_syscons.c projects/clang380-import/sys/powerpc/ps3/ps3bus.c projects/clang380-import/sys/powerpc/ps3/ps3cdrom.c projects/clang380-import/sys/powerpc/ps3/ps3disk.c projects/clang380-import/sys/powerpc/pseries/platform_chrp.c projects/clang380-import/sys/powerpc/psim/iobus.c projects/clang380-import/sys/riscv/include/atomic.h projects/clang380-import/sys/riscv/riscv/genassym.c projects/clang380-import/sys/riscv/riscv/machdep.c projects/clang380-import/sys/riscv/riscv/minidump_machdep.c projects/clang380-import/sys/riscv/riscv/timer.c projects/clang380-import/sys/riscv/riscv/trap.c projects/clang380-import/sys/sparc64/pci/fire.c projects/clang380-import/sys/sparc64/sparc64/iommu.c projects/clang380-import/sys/sparc64/sparc64/tlb.c projects/clang380-import/sys/x86/acpica/acpi_wakeup.c projects/clang380-import/sys/x86/x86/nexus.c projects/clang380-import/usr.sbin/config/config.5 projects/clang380-import/usr.sbin/iostat/iostat.c Directory Properties: projects/clang380-import/ (props changed) projects/clang380-import/contrib/binutils/ (props changed) projects/clang380-import/lib/libvmmapi/ (props changed) projects/clang380-import/share/ (props changed) projects/clang380-import/sys/ (props changed) projects/clang380-import/sys/amd64/vmm/ (props changed) projects/clang380-import/sys/boot/ (props changed) projects/clang380-import/sys/conf/ (props changed) projects/clang380-import/sys/dev/hyperv/ (props changed) Modified: projects/clang380-import/bin/dd/args.c ============================================================================== --- projects/clang380-import/bin/dd/args.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/bin/dd/args.c Mon Feb 22 22:21:53 2016 (r295902) @@ -422,11 +422,10 @@ get_num(const char *val) errno = 0; num = strtoumax(val, &expr, 0); - if (errno != 0) /* Overflow or underflow. */ - err(1, "%s", oper); - if (expr == val) /* No valid digits. */ - errx(1, "%s: illegal numeric value", oper); + errx(1, "%s: invalid numeric value", oper); + if (errno != 0) + err(1, "%s", oper); mult = postfix_to_mult(*expr); @@ -472,11 +471,10 @@ get_off_t(const char *val) errno = 0; num = strtoimax(val, &expr, 0); - if (errno != 0) /* Overflow or underflow. */ - err(1, "%s", oper); - if (expr == val) /* No valid digits. */ - errx(1, "%s: illegal numeric value", oper); + errx(1, "%s: invalid numeric value", oper); + if (errno != 0) + err(1, "%s", oper); mult = postfix_to_mult(*expr); Modified: projects/clang380-import/bin/sh/alias.c ============================================================================== --- projects/clang380-import/bin/sh/alias.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/bin/sh/alias.c Mon Feb 22 22:21:53 2016 (r295902) @@ -144,9 +144,11 @@ rmaliases(void) struct alias * lookupalias(const char *name, int check) { - struct alias *ap = *hashalias(name); + struct alias *ap; - for (; ap; ap = ap->next) { + if (aliases == 0) + return (NULL); + for (ap = *hashalias(name); ap; ap = ap->next) { if (equal(name, ap->name)) { if (check && (ap->flag & ALIASINUSE)) return (NULL); Modified: projects/clang380-import/bin/sh/input.c ============================================================================== --- projects/clang380-import/bin/sh/input.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/bin/sh/input.c Mon Feb 22 22:21:53 2016 (r295902) @@ -212,8 +212,6 @@ preadbuffer(void) } if (parsenleft == EOF_NLEFT || parsefile->buf == NULL) return PEOF; - flushout(&output); - flushout(&errout); again: if (parselleft <= 0) { Modified: projects/clang380-import/bin/sh/parser.c ============================================================================== --- projects/clang380-import/bin/sh/parser.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/bin/sh/parser.c Mon Feb 22 22:21:53 2016 (r295902) @@ -1930,6 +1930,8 @@ static void setprompt(int which) { whichprompt = which; + if (which == 0) + return; #ifndef NO_HISTORY if (!el) Modified: projects/clang380-import/contrib/binutils/bfd/elf.c ============================================================================== --- projects/clang380-import/contrib/binutils/bfd/elf.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/contrib/binutils/bfd/elf.c Mon Feb 22 22:21:53 2016 (r295902) @@ -8934,14 +8934,14 @@ elf_create_symbuf (bfd_size_type symcoun shndx_count++; ssymbuf = bfd_malloc ((shndx_count + 1) * sizeof (*ssymbuf) - + (indbufend - indbuf) * sizeof (*ssymbuf)); + + (indbufend - indbuf) * sizeof (*ssym)); if (ssymbuf == NULL) { free (indbuf); return NULL; } - ssym = (struct elf_symbuf_symbol *) (ssymbuf + shndx_count); + ssym = (struct elf_symbuf_symbol *) (ssymbuf + shndx_count + 1); ssymbuf->ssym = NULL; ssymbuf->count = shndx_count; ssymbuf->st_shndx = 0; Modified: projects/clang380-import/contrib/binutils/bfd/elf32-arm.c ============================================================================== --- projects/clang380-import/contrib/binutils/bfd/elf32-arm.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/contrib/binutils/bfd/elf32-arm.c Mon Feb 22 22:21:53 2016 (r295902) @@ -59,13 +59,6 @@ #define elf_info_to_howto 0 #define elf_info_to_howto_rel elf32_arm_info_to_howto -#define ARM_ELF_ABI_VERSION 0 -#ifdef __FreeBSD__ -#define ARM_ELF_OS_ABI_VERSION ELFOSABI_FREEBSD -#else -#define ARM_ELF_OS_ABI_VERSION ELFOSABI_ARM -#endif - static struct elf_backend_data elf32_arm_vxworks_bed; /* Note: code such as elf32_arm_reloc_type_lookup expect to use e.g. @@ -9377,11 +9370,8 @@ elf32_arm_post_process_headers (bfd * ab i_ehdrp = elf_elfheader (abfd); - if (EF_ARM_EABI_VERSION (i_ehdrp->e_flags) == EF_ARM_EABI_UNKNOWN) - i_ehdrp->e_ident[EI_OSABI] = ARM_ELF_OS_ABI_VERSION; - else - i_ehdrp->e_ident[EI_OSABI] = 0; - i_ehdrp->e_ident[EI_ABIVERSION] = ARM_ELF_ABI_VERSION; + i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_FREEBSD; + i_ehdrp->e_ident[EI_ABIVERSION] = 0; if (link_info) { Modified: projects/clang380-import/lib/libvmmapi/vmmapi.c ============================================================================== --- projects/clang380-import/lib/libvmmapi/vmmapi.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/lib/libvmmapi/vmmapi.c Mon Feb 22 22:21:53 2016 (r295902) @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include <x86/segments.h> #include <machine/specialreg.h> -#include <machine/param.h> #include <errno.h> #include <stdio.h> Modified: projects/clang380-import/share/man/man9/bios.9 ============================================================================== --- projects/clang380-import/share/man/man9/bios.9 Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/share/man/man9/bios.9 Mon Feb 22 22:21:53 2016 (r295902) @@ -37,8 +37,6 @@ .In sys/param.h .In vm/vm.h .In vm/pmap.h -.In machine/param.h -.In machine/pmap.h .In machine/pc/bios.h .Ft uint32_t .Fn bios_sigsearch "uint32_t start" "u_char *sig" "int siglen" "int paralen" "int sigofs" Modified: projects/clang380-import/sys/amd64/amd64/minidump_machdep.c ============================================================================== --- projects/clang380-import/sys/amd64/amd64/minidump_machdep.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/amd64/amd64/minidump_machdep.c Mon Feb 22 22:21:53 2016 (r295902) @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include <machine/atomic.h> #include <machine/elf.h> #include <machine/md_var.h> -#include <machine/vmparam.h> #include <machine/minidump.h> CTASSERT(sizeof(struct kerneldumpheader) == 512); Modified: projects/clang380-import/sys/amd64/cloudabi64/cloudabi64_sysvec.c ============================================================================== --- projects/clang380-import/sys/amd64/cloudabi64/cloudabi64_sysvec.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/amd64/cloudabi64/cloudabi64_sysvec.c Mon Feb 22 22:21:53 2016 (r295902) @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include <machine/frame.h> #include <machine/pcb.h> -#include <machine/pmap.h> #include <machine/vmparam.h> #include <compat/cloudabi/cloudabi_util.h> Modified: projects/clang380-import/sys/amd64/vmm/amd/npt.c ============================================================================== --- projects/clang380-import/sys/amd64/vmm/amd/npt.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/amd64/vmm/amd/npt.c Mon Feb 22 22:21:53 2016 (r295902) @@ -36,8 +36,6 @@ __FBSDID("$FreeBSD$"); #include <vm/pmap.h> #include <vm/vm_extern.h> -#include <machine/pmap.h> - #include "npt.h" SYSCTL_DECL(_hw_vmm); Modified: projects/clang380-import/sys/amd64/vmm/amd/svm.c ============================================================================== --- projects/clang380-import/sys/amd64/vmm/amd/svm.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/amd64/vmm/amd/svm.c Mon Feb 22 22:21:53 2016 (r295902) @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include <machine/cpufunc.h> #include <machine/psl.h> -#include <machine/pmap.h> #include <machine/md_var.h> #include <machine/specialreg.h> #include <machine/smp.h> Modified: projects/clang380-import/sys/amd64/vmm/vmm.c ============================================================================== --- projects/clang380-import/sys/amd64/vmm/vmm.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/amd64/vmm/vmm.c Mon Feb 22 22:21:53 2016 (r295902) @@ -53,12 +53,10 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <machine/cpu.h> -#include <machine/vm.h> #include <machine/pcb.h> #include <machine/smp.h> #include <x86/psl.h> #include <x86/apicreg.h> -#include <machine/vmparam.h> #include <machine/vmm.h> #include <machine/vmm_dev.h> Modified: projects/clang380-import/sys/arm/allwinner/a20/std.a20 ============================================================================== --- projects/clang380-import/sys/arm/allwinner/a20/std.a20 Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/allwinner/a20/std.a20 Mon Feb 22 22:21:53 2016 (r295902) @@ -8,8 +8,6 @@ makeoptions CONF_CFLAGS="-march=armv7a" makeoptions KERNVIRTADDR=0xc0200000 options KERNVIRTADDR=0xc0200000 -options ARM_L2_PIPT - options IPI_IRQ_START=0 options IPI_IRQ_END=15 Modified: projects/clang380-import/sys/arm/allwinner/std.a10 ============================================================================== --- projects/clang380-import/sys/arm/allwinner/std.a10 Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/allwinner/std.a10 Mon Feb 22 22:21:53 2016 (r295902) @@ -8,7 +8,5 @@ makeoptions CONF_CFLAGS="-march=armv7a" makeoptions KERNVIRTADDR=0xc0200000 options KERNVIRTADDR=0xc0200000 -options ARM_L2_PIPT - files "../allwinner/files.allwinner" files "../allwinner/files.a10" Modified: projects/clang380-import/sys/arm/altera/socfpga/std.socfpga ============================================================================== --- projects/clang380-import/sys/arm/altera/socfpga/std.socfpga Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/altera/socfpga/std.socfpga Mon Feb 22 22:21:53 2016 (r295902) @@ -7,8 +7,6 @@ makeoptions CONF_CFLAGS="-march=armv7a" makeoptions KERNVIRTADDR=0xc0f00000 options KERNVIRTADDR=0xc0f00000 -options ARM_L2_PIPT - options IPI_IRQ_START=0 options IPI_IRQ_END=15 Modified: projects/clang380-import/sys/arm/amlogic/aml8726/std.aml8726 ============================================================================== --- projects/clang380-import/sys/arm/amlogic/aml8726/std.aml8726 Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/amlogic/aml8726/std.aml8726 Mon Feb 22 22:21:53 2016 (r295902) @@ -17,8 +17,6 @@ device fdt_pinctrl files "../amlogic/aml8726/files.aml8726" -options ARM_L2_PIPT - # Set all global interrupts to be edge triggered, active high. options GIC_DEFAULT_ICFGR_INIT=0xffffffff Modified: projects/clang380-import/sys/arm/annapurna/alpine/alpine_machdep.c ============================================================================== --- projects/clang380-import/sys/arm/annapurna/alpine/alpine_machdep.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/annapurna/alpine/alpine_machdep.c Mon Feb 22 22:21:53 2016 (r295902) @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */ #include <machine/machdep.h> -#include <machine/pmap.h> #include <machine/devmap.h> #include <machine/platform.h> #include <machine/fdt.h> Modified: projects/clang380-import/sys/arm/annapurna/alpine/std.alpine ============================================================================== --- projects/clang380-import/sys/arm/annapurna/alpine/std.alpine Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/annapurna/alpine/std.alpine Mon Feb 22 22:21:53 2016 (r295902) @@ -10,8 +10,6 @@ options KERNVIRTADDR=0xa0200000 makeoptions KERNBASE=0xa0000000 options KERNBASE=0xa0000000 -options ARM_L2_PIPT - options IPI_IRQ_START=0 options IPI_IRQ_END=15 Modified: projects/clang380-import/sys/arm/arm/debug_monitor.c ============================================================================== --- projects/clang380-import/sys/arm/arm/debug_monitor.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/arm/debug_monitor.c Mon Feb 22 22:21:53 2016 (r295902) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> #include <machine/debug_monitor.h> #include <machine/kdb.h> -#include <machine/param.h> #include <machine/pcb.h> #include <machine/reg.h> Modified: projects/clang380-import/sys/arm/arm/genassym.c ============================================================================== --- projects/clang380-import/sys/arm/arm/genassym.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/arm/genassym.c Mon Feb 22 22:21:53 2016 (r295902) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_map.h> #include <machine/acle-compat.h> -#include <machine/vmparam.h> #include <machine/armreg.h> #include <machine/frame.h> #include <machine/pcb.h> Modified: projects/clang380-import/sys/arm/arm/mp_machdep.c ============================================================================== --- projects/clang380-import/sys/arm/arm/mp_machdep.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/arm/mp_machdep.c Mon Feb 22 22:21:53 2016 (r295902) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include <machine/debug_monitor.h> #include <machine/smp.h> #include <machine/pcb.h> -#include <machine/pmap.h> #include <machine/physmem.h> #include <machine/intr.h> #include <machine/vmparam.h> Modified: projects/clang380-import/sys/arm/arm/pmap-v6.c ============================================================================== --- projects/clang380-import/sys/arm/arm/pmap-v6.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/arm/pmap-v6.c Mon Feb 22 22:21:53 2016 (r295902) @@ -121,7 +121,6 @@ __FBSDID("$FreeBSD$"); #endif #include <machine/physmem.h> -#include <machine/vmparam.h> #include <vm/vm.h> #include <vm/uma.h> Modified: projects/clang380-import/sys/arm/arm/trap-v4.c ============================================================================== --- projects/clang380-import/sys/arm/arm/trap-v4.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/arm/trap-v4.c Mon Feb 22 22:21:53 2016 (r295902) @@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_map.h> #include <vm/vm_extern.h> -#include <machine/acle-compat.h> #include <machine/cpu.h> #include <machine/frame.h> #include <machine/machdep.h> @@ -312,16 +311,13 @@ abort_handler(struct trapframe *tf, int } /* - * We need to know whether the page should be mapped as R or R/W. On - * armv6 and later the fault status register indicates whether the - * access was a read or write. Prior to armv6, we know that a - * permission fault can only be the result of a write to a read-only - * location, so we can deal with those quickly. Otherwise we need to - * disassemble the faulting instruction to determine if it was a write. + * We need to know whether the page should be mapped as R or R/W. + * On armv4, the fault status register does not indicate whether + * the access was a read or write. We know that a permission fault + * can only be the result of a write to a read-only location, so we + * can deal with those quickly. Otherwise we need to disassemble + * the faulting instruction to determine if it was a write. */ -#if __ARM_ARCH >= 6 - ftype = (fsr & FAULT_WNR) ? VM_PROT_READ | VM_PROT_WRITE : VM_PROT_READ; -#else if (IS_PERMISSION_FAULT(fsr)) ftype = VM_PROT_WRITE; else { @@ -338,7 +334,6 @@ abort_handler(struct trapframe *tf, int ftype = VM_PROT_READ; } } -#endif /* * See if the fault is as a result of ref/mod emulation, Modified: projects/clang380-import/sys/arm/arm/trap-v6.c ============================================================================== --- projects/clang380-import/sys/arm/arm/trap-v6.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/arm/trap-v6.c Mon Feb 22 22:21:53 2016 (r295902) @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include <machine/frame.h> #include <machine/machdep.h> #include <machine/pcb.h> -#include <machine/vmparam.h> #ifdef KDB #include <sys/kdb.h> Modified: projects/clang380-import/sys/arm/broadcom/bcm2835/std.bcm2836 ============================================================================== --- projects/clang380-import/sys/arm/broadcom/bcm2835/std.bcm2836 Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/broadcom/bcm2835/std.bcm2836 Mon Feb 22 22:21:53 2016 (r295902) @@ -5,7 +5,6 @@ cpu CPU_CORTEXA makeoptions CONF_CFLAGS="-march=armv7a" options SOC_BCM2836 -options ARM_L2_PIPT options IPI_IRQ_START=76 files "../broadcom/bcm2835/files.bcm2836" Modified: projects/clang380-import/sys/arm/conf/std.armv6 ============================================================================== --- projects/clang380-import/sys/arm/conf/std.armv6 Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/conf/std.armv6 Mon Feb 22 22:21:53 2016 (r295902) @@ -2,6 +2,8 @@ # # $FreeBSD$ +options ARM_L2_PIPT # Only L2 PIPT is supported + options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols Modified: projects/clang380-import/sys/arm/freescale/imx/std.imx51 ============================================================================== --- projects/clang380-import/sys/arm/freescale/imx/std.imx51 Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/freescale/imx/std.imx51 Mon Feb 22 22:21:53 2016 (r295902) @@ -2,7 +2,6 @@ machine arm armv6 cpu CPU_CORTEXA makeoptions CONF_CFLAGS="-march=armv7a" -options ARM_L2_PIPT options KERNVIRTADDR=0xc0100000 makeoptions KERNVIRTADDR=0xc0100000 Modified: projects/clang380-import/sys/arm/freescale/imx/std.imx53 ============================================================================== --- projects/clang380-import/sys/arm/freescale/imx/std.imx53 Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/freescale/imx/std.imx53 Mon Feb 22 22:21:53 2016 (r295902) @@ -2,7 +2,6 @@ machine arm armv6 cpu CPU_CORTEXA makeoptions CONF_CFLAGS="-march=armv7a" -options ARM_L2_PIPT options KERNVIRTADDR=0xc0100000 makeoptions KERNVIRTADDR=0xc0100000 Modified: projects/clang380-import/sys/arm/freescale/imx/std.imx6 ============================================================================== --- projects/clang380-import/sys/arm/freescale/imx/std.imx6 Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/freescale/imx/std.imx6 Mon Feb 22 22:21:53 2016 (r295902) @@ -2,7 +2,6 @@ machine arm armv6 cpu CPU_CORTEXA makeoptions CONF_CFLAGS="-march=armv7a" -options ARM_L2_PIPT options KERNVIRTADDR = 0xc2000000 makeoptions KERNVIRTADDR = 0xc2000000 Modified: projects/clang380-import/sys/arm/freescale/vybrid/std.vybrid ============================================================================== --- projects/clang380-import/sys/arm/freescale/vybrid/std.vybrid Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/freescale/vybrid/std.vybrid Mon Feb 22 22:21:53 2016 (r295902) @@ -7,6 +7,4 @@ makeoptions CONF_CFLAGS="-march=armv7a" makeoptions KERNVIRTADDR=0xc0100000 options KERNVIRTADDR=0xc0100000 -options ARM_L2_PIPT - files "../freescale/vybrid/files.vybrid" Modified: projects/clang380-import/sys/arm/mv/armadaxp/std.armadaxp ============================================================================== --- projects/clang380-import/sys/arm/mv/armadaxp/std.armadaxp Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/mv/armadaxp/std.armadaxp Mon Feb 22 22:21:53 2016 (r295902) @@ -2,5 +2,3 @@ makeoptions KERNVIRTADDR=0xc0200000 options KERNVIRTADDR=0xc0200000 - -options ARM_L2_PIPT Modified: projects/clang380-import/sys/arm/mv/mvvar.h ============================================================================== --- projects/clang380-import/sys/arm/mv/mvvar.h Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/mv/mvvar.h Mon Feb 22 22:21:53 2016 (r295902) @@ -44,7 +44,6 @@ #include <machine/bus.h> #include <vm/vm.h> #include <vm/pmap.h> -#include <machine/vm.h> #include <dev/ofw/openfirm.h> Modified: projects/clang380-import/sys/arm/qemu/std.virt ============================================================================== --- projects/clang380-import/sys/arm/qemu/std.virt Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/qemu/std.virt Mon Feb 22 22:21:53 2016 (r295902) @@ -2,7 +2,6 @@ machine arm armv6 cpu CPU_CORTEXA makeoptions CONF_CFLAGS="-march=armv7a" -options ARM_L2_PIPT options KERNVIRTADDR = 0xc1000000 makeoptions KERNVIRTADDR = 0xc1000000 Modified: projects/clang380-import/sys/arm/rockchip/std.rk30xx ============================================================================== --- projects/clang380-import/sys/arm/rockchip/std.rk30xx Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/rockchip/std.rk30xx Mon Feb 22 22:21:53 2016 (r295902) @@ -8,8 +8,6 @@ makeoptions CONF_CFLAGS="-march=armv7a" makeoptions KERNVIRTADDR=0xc0400000 options KERNVIRTADDR=0xc0400000 -options ARM_L2_PIPT - options IPI_IRQ_START=0 options IPI_IRQ_END=15 Modified: projects/clang380-import/sys/arm/samsung/exynos/std.exynos5250 ============================================================================== --- projects/clang380-import/sys/arm/samsung/exynos/std.exynos5250 Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/samsung/exynos/std.exynos5250 Mon Feb 22 22:21:53 2016 (r295902) @@ -7,8 +7,6 @@ makeoptions CONF_CFLAGS="-march=armv7a" makeoptions KERNVIRTADDR=0xc0f00000 options KERNVIRTADDR=0xc0f00000 -options ARM_L2_PIPT - options IPI_IRQ_START=0 options IPI_IRQ_END=15 Modified: projects/clang380-import/sys/arm/samsung/exynos/std.exynos5420 ============================================================================== --- projects/clang380-import/sys/arm/samsung/exynos/std.exynos5420 Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/samsung/exynos/std.exynos5420 Mon Feb 22 22:21:53 2016 (r295902) @@ -7,8 +7,6 @@ makeoptions CONF_CFLAGS="-march=armv7a" makeoptions KERNVIRTADDR=0xc0f00000 options KERNVIRTADDR=0xc0f00000 -options ARM_L2_PIPT - options IPI_IRQ_START=0 options IPI_IRQ_END=15 Modified: projects/clang380-import/sys/arm/ti/am335x/std.am335x ============================================================================== --- projects/clang380-import/sys/arm/ti/am335x/std.am335x Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/ti/am335x/std.am335x Mon Feb 22 22:21:53 2016 (r295902) @@ -7,5 +7,3 @@ options KERNVIRTADDR=0xc0200000 # Used makeoptions KERNVIRTADDR=0xc0200000 options SOC_TI_AM335X - -options ARM_L2_PIPT Modified: projects/clang380-import/sys/arm/ti/omap4/std.omap4 ============================================================================== --- projects/clang380-import/sys/arm/ti/omap4/std.omap4 Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/ti/omap4/std.omap4 Mon Feb 22 22:21:53 2016 (r295902) @@ -7,5 +7,3 @@ options KERNVIRTADDR=0xc0200000 # Used makeoptions KERNVIRTADDR=0xc0200000 options SOC_OMAP4 - -options ARM_L2_PIPT Modified: projects/clang380-import/sys/arm/xilinx/std.zynq7 ============================================================================== --- projects/clang380-import/sys/arm/xilinx/std.zynq7 Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm/xilinx/std.zynq7 Mon Feb 22 22:21:53 2016 (r295902) @@ -12,7 +12,5 @@ files "../xilinx/files.zynq7" options KERNVIRTADDR=0xc0100000 # Used in ldscript.arm makeoptions KERNVIRTADDR=0xc0100000 -options ARM_L2_PIPT - options IPI_IRQ_START=0 options IPI_IRQ_END=15 Modified: projects/clang380-import/sys/arm64/arm64/debug_monitor.c ============================================================================== --- projects/clang380-import/sys/arm64/arm64/debug_monitor.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm64/arm64/debug_monitor.c Mon Feb 22 22:21:53 2016 (r295902) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> #include <machine/debug_monitor.h> #include <machine/kdb.h> -#include <machine/param.h> #include <ddb/ddb.h> #include <ddb/db_sym.h> Modified: projects/clang380-import/sys/arm64/arm64/minidump_machdep.c ============================================================================== --- projects/clang380-import/sys/arm64/arm64/minidump_machdep.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm64/arm64/minidump_machdep.c Mon Feb 22 22:21:53 2016 (r295902) @@ -52,9 +52,7 @@ __FBSDID("$FreeBSD$"); #include <vm/pmap.h> #include <machine/md_var.h> -#include <machine/pmap.h> #include <machine/pte.h> -#include <machine/vmparam.h> #include <machine/minidump.h> CTASSERT(sizeof(struct kerneldumpheader) == 512); Modified: projects/clang380-import/sys/arm64/arm64/trap.c ============================================================================== --- projects/clang380-import/sys/arm64/arm64/trap.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm64/arm64/trap.c Mon Feb 22 22:21:53 2016 (r295902) @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include <machine/frame.h> #include <machine/pcb.h> #include <machine/pcpu.h> -#include <machine/vmparam.h> #ifdef KDTRACE_HOOKS #include <sys/dtrace_bsd.h> Modified: projects/clang380-import/sys/arm64/cloudabi64/cloudabi64_sysvec.c ============================================================================== --- projects/clang380-import/sys/arm64/cloudabi64/cloudabi64_sysvec.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm64/cloudabi64/cloudabi64_sysvec.c Mon Feb 22 22:21:53 2016 (r295902) @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include <machine/frame.h> #include <machine/pcb.h> -#include <machine/pmap.h> #include <machine/vmparam.h> #include <compat/cloudabi/cloudabi_util.h> Modified: projects/clang380-import/sys/arm64/conf/GENERIC ============================================================================== --- projects/clang380-import/sys/arm64/conf/GENERIC Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/arm64/conf/GENERIC Mon Feb 22 22:21:53 2016 (r295902) @@ -103,6 +103,7 @@ device mii device miibus # MII bus support device em # Intel PRO/1000 Gigabit Ethernet Family device igb # Intel PRO/1000 PCIE Server Gigabit Family +device ix # Intel 10Gb Ethernet Family device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet device vnic # Cavium ThunderX NIC Modified: projects/clang380-import/sys/boot/efi/include/efilib.h ============================================================================== --- projects/clang380-import/sys/boot/efi/include/efilib.h Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/boot/efi/include/efilib.h Mon Feb 22 22:21:53 2016 (r295902) @@ -46,7 +46,6 @@ int efi_handle_lookup(EFI_HANDLE, struct int efi_handle_update_dev(EFI_HANDLE, struct devsw *, int, uint64_t); int efi_status_to_errno(EFI_STATUS); -time_t efi_time(EFI_TIME *); EFI_STATUS main(int argc, CHAR16 *argv[]); void exit(EFI_STATUS status); Modified: projects/clang380-import/sys/boot/efi/libefi/time.c ============================================================================== --- projects/clang380-import/sys/boot/efi/libefi/time.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/boot/efi/libefi/time.c Mon Feb 22 22:21:53 2016 (r295902) @@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$"); #define SECSPERHOUR ( 60*60 ) #define SECSPERDAY (24 * SECSPERHOUR) -time_t +static time_t efi_time(EFI_TIME *ETime) { /* @@ -164,7 +164,7 @@ efi_time(EFI_TIME *ETime) return UTime; } -int +static int EFI_GetTimeOfDay( OUT struct timeval *tp, OUT struct timezone *tzp Modified: projects/clang380-import/sys/boot/uboot/lib/net.c ============================================================================== --- projects/clang380-import/sys/boot/uboot/lib/net.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/boot/uboot/lib/net.c Mon Feb 22 22:21:53 2016 (r295902) @@ -108,9 +108,19 @@ get_env_net_params() char *envstr; in_addr_t rootaddr, serveraddr; - /* Silently get out right away if we don't have rootpath. */ - if (ub_env_get("rootpath") == NULL) + /* + * Silently get out right away if we don't have rootpath, because none + * of the other info we obtain below is sufficient to boot without it. + * + * If we do have rootpath, copy it into the global var and also set + * dhcp.root-path in the env. If we don't get all the other info from + * the u-boot env below, we will still try dhcp/bootp, but the server- + * provided path will not replace the user-provided value we set here. + */ + if ((envstr = ub_env_get("rootpath")) == NULL) return; + strlcpy(rootpath, envstr, sizeof(rootpath)); + setenv("dhcp.root-path", rootpath, 0); /* * Our own IP address must be valid. Silently get out if it's not set, @@ -154,9 +164,6 @@ get_env_net_params() * There must be a rootpath. It may be ip:/path or it may be just the * path in which case the ip needs to be in serverip. */ - if ((envstr = ub_env_get("rootpath")) == NULL) - return; - strncpy(rootpath, envstr, sizeof(rootpath) - 1); rootaddr = net_parse_rootpath(); if (rootaddr == INADDR_NONE) rootaddr = serveraddr; Modified: projects/clang380-import/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c ============================================================================== --- projects/clang380-import/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c Mon Feb 22 22:21:53 2016 (r295902) @@ -44,7 +44,6 @@ #include <machine/atomic.h> #include <machine/db_machdep.h> #include <machine/md_var.h> -#include <machine/vmparam.h> #include <machine/stack.h> #include <ddb/db_sym.h> #include <ddb/ddb.h> Modified: projects/clang380-import/sys/cddl/dev/dtrace/arm/dtrace_isa.c ============================================================================== --- projects/clang380-import/sys/cddl/dev/dtrace/arm/dtrace_isa.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/cddl/dev/dtrace/arm/dtrace_isa.c Mon Feb 22 22:21:53 2016 (r295902) @@ -44,7 +44,6 @@ #include <machine/atomic.h> #include <machine/db_machdep.h> #include <machine/md_var.h> -#include <machine/vmparam.h> #include <machine/stack.h> #include <ddb/db_sym.h> #include <ddb/ddb.h> Modified: projects/clang380-import/sys/cddl/dev/dtrace/mips/dtrace_isa.c ============================================================================== --- projects/clang380-import/sys/cddl/dev/dtrace/mips/dtrace_isa.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/cddl/dev/dtrace/mips/dtrace_isa.c Mon Feb 22 22:21:53 2016 (r295902) @@ -44,7 +44,6 @@ #include <machine/db_machdep.h> #include <machine/md_var.h> #include <machine/mips_opcode.h> -#include <machine/vmparam.h> #include <ddb/db_sym.h> #include <ddb/ddb.h> #include <sys/kdb.h> Modified: projects/clang380-import/sys/compat/linprocfs/linprocfs.c ============================================================================== --- projects/clang380-import/sys/compat/linprocfs/linprocfs.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/compat/linprocfs/linprocfs.c Mon Feb 22 22:21:53 2016 (r295902) @@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/ptrace.h> #include <sys/resourcevar.h> +#include <sys/resource.h> #include <sys/sbuf.h> #include <sys/sem.h> #include <sys/smp.h> @@ -1366,6 +1367,67 @@ linprocfs_dofdescfs(PFS_FILL_ARGS) return (0); } +/* + * Filler function for proc/pid/limits + */ + +#define RLIM_NONE -1 + +static const struct limit_info { + const char *desc; + const char *unit; + unsigned long long rlim_id; +} limits_info[] = { + { "Max cpu time", "seconds", RLIMIT_CPU }, + { "Max file size", "bytes", RLIMIT_FSIZE }, + { "Max data size", "bytes", RLIMIT_DATA }, + { "Max stack size", "bytes", RLIMIT_STACK }, + { "Max core file size", "bytes", RLIMIT_CORE }, + { "Max resident set", "bytes", RLIMIT_RSS }, + { "Max processes", "processes", RLIMIT_NPROC }, + { "Max open files", "files", RLIMIT_NOFILE }, + { "Max locked memory", "bytes", RLIMIT_MEMLOCK }, + { "Max address space", "bytes", RLIMIT_AS }, + { "Max file locks", "locks", RLIM_INFINITY }, + { "Max pending signals", "signals", RLIM_INFINITY }, + { "Max msgqueue size", "bytes", RLIM_NONE }, + { "Max nice priority", "", RLIM_NONE }, + { "Max realtime priority", "", RLIM_NONE }, + { "Max realtime timeout", "us", RLIM_INFINITY }, + { 0, 0, 0 } +}; + +static int +linprocfs_doproclimits(PFS_FILL_ARGS) +{ + const struct limit_info *li; + struct rlimit li_rlimits; + struct plimit *cur_proc_lim; + + cur_proc_lim = lim_alloc(); + lim_copy(cur_proc_lim, p->p_limit); + sbuf_printf(sb, "%-26s%-21s%-21s%-10s\n", "Limit", "Soft Limit", + "Hard Limit", "Units"); + for (li = limits_info; li->desc != NULL; ++li) { + if (li->rlim_id != RLIM_INFINITY && li->rlim_id != RLIM_NONE) + li_rlimits = cur_proc_lim->pl_rlimit[li->rlim_id]; + else { + li_rlimits.rlim_cur = 0; + li_rlimits.rlim_max = 0; + } + if (li->rlim_id == RLIM_INFINITY || + li_rlimits.rlim_cur == RLIM_INFINITY) + sbuf_printf(sb, "%-26s%-21s%-21s%-10s\n", + li->desc, "unlimited", "unlimited", li->unit); + else + sbuf_printf(sb, "%-26s%-21ld%-21ld%-10s\n", + li->desc, (long)li_rlimits.rlim_cur, + (long)li_rlimits.rlim_max, li->unit); + } + lim_free(cur_proc_lim); + return (0); +} + /* * Filler function for proc/sys/kernel/random/uuid @@ -1504,6 +1566,8 @@ linprocfs_init(PFS_INIT_ARGS) NULL, NULL, NULL, 0); pfs_create_file(dir, "auxv", &linprocfs_doauxv, NULL, &procfs_candebug, NULL, PFS_RD|PFS_RAWRD); + pfs_create_file(dir, "limits", &linprocfs_doproclimits, + NULL, NULL, NULL, PFS_RD); /* /proc/scsi/... */ dir = pfs_create_dir(root, "scsi", NULL, NULL, NULL, 0); Modified: projects/clang380-import/sys/compat/linux/linux_util.h ============================================================================== --- projects/clang380-import/sys/compat/linux/linux_util.h Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/compat/linux/linux_util.h Mon Feb 22 22:21:53 2016 (r295902) @@ -37,7 +37,6 @@ #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/pmap.h> -#include <machine/vmparam.h> #include <sys/exec.h> #include <sys/sysent.h> #include <sys/syslog.h> Modified: projects/clang380-import/sys/compat/linuxkpi/common/include/linux/dma-mapping.h ============================================================================== --- projects/clang380-import/sys/compat/linuxkpi/common/include/linux/dma-mapping.h Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/compat/linuxkpi/common/include/linux/dma-mapping.h Mon Feb 22 22:21:53 2016 (r295902) @@ -47,7 +47,6 @@ #include <vm/pmap.h> #include <machine/bus.h> -#include <machine/pmap.h> enum dma_data_direction { DMA_BIDIRECTIONAL = 0, Modified: projects/clang380-import/sys/compat/linuxkpi/common/include/linux/list.h ============================================================================== --- projects/clang380-import/sys/compat/linuxkpi/common/include/linux/list.h Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/compat/linuxkpi/common/include/linux/list.h Mon Feb 22 22:21:53 2016 (r295902) @@ -68,7 +68,6 @@ #include <vm/vm.h> #include <vm/vm_object.h> #include <vm/pmap.h> -#include <machine/pmap.h> #define prefetch(x) Modified: projects/clang380-import/sys/compat/linuxkpi/common/src/linux_compat.c ============================================================================== --- projects/clang380-import/sys/compat/linuxkpi/common/src/linux_compat.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/compat/linuxkpi/common/src/linux_compat.c Mon Feb 22 22:21:53 2016 (r295902) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include <vm/pmap.h> #include <machine/stdarg.h> -#include <machine/pmap.h> #include <linux/kobject.h> #include <linux/device.h> Modified: projects/clang380-import/sys/compat/linuxkpi/common/src/linux_pci.c ============================================================================== --- projects/clang380-import/sys/compat/linuxkpi/common/src/linux_pci.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/compat/linuxkpi/common/src/linux_pci.c Mon Feb 22 22:21:53 2016 (r295902) @@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$"); #include <vm/pmap.h> #include <machine/stdarg.h> -#include <machine/pmap.h> #include <linux/kobject.h> #include <linux/device.h> Modified: projects/clang380-import/sys/compat/svr4/svr4_misc.c ============================================================================== --- projects/clang380-import/sys/compat/svr4/svr4_misc.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/compat/svr4/svr4_misc.c Mon Feb 22 22:21:53 2016 (r295902) @@ -84,7 +84,6 @@ __FBSDID("$FreeBSD$"); #include <security/mac/mac_framework.h> -#include <machine/vmparam.h> #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/vm_map.h> Modified: projects/clang380-import/sys/compat/svr4/svr4_util.h ============================================================================== --- projects/clang380-import/sys/compat/svr4/svr4_util.h Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/compat/svr4/svr4_util.h Mon Feb 22 22:21:53 2016 (r295902) @@ -35,7 +35,6 @@ #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/pmap.h> -#include <machine/vmparam.h> #include <sys/exec.h> #include <sys/sysent.h> #include <sys/cdefs.h> Modified: projects/clang380-import/sys/conf/files.riscv ============================================================================== --- projects/clang380-import/sys/conf/files.riscv Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/conf/files.riscv Mon Feb 22 22:21:53 2016 (r295902) @@ -34,9 +34,10 @@ riscv/riscv/machdep.c standard riscv/riscv/mem.c standard riscv/riscv/nexus.c standard riscv/riscv/pmap.c standard -riscv/riscv/sys_machdep.c standard +riscv/riscv/stack_machdep.c standard riscv/riscv/support.S standard riscv/riscv/swtch.S standard +riscv/riscv/sys_machdep.c standard riscv/riscv/trap.c standard riscv/riscv/timer.c standard riscv/riscv/uio_machdep.c standard Modified: projects/clang380-import/sys/conf/kern.post.mk ============================================================================== --- projects/clang380-import/sys/conf/kern.post.mk Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/conf/kern.post.mk Mon Feb 22 22:21:53 2016 (r295902) @@ -222,10 +222,9 @@ _MKDEPCC:= ${CC:N${CCACHE_BIN}} SRCS= assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \ ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \ ${MFILES:T:S/.m$/.h/} -DEPENDFILES= .depend +DEPENDFILES= .depend .depend.* .if ${MK_FAST_DEPEND} == "yes" && \ (${.MAKE.MODE:Unormal:Mmeta} == "" || ${.MAKE.MODE:Unormal:Mnofilemon} != "") -DEPENDFILES+= .depend.* DEPEND_CFLAGS+= -MD -MP -MF.depend.${.TARGET} DEPEND_CFLAGS+= -MT${.TARGET} .if defined(.PARSEDIR) Modified: projects/clang380-import/sys/conf/options ============================================================================== --- projects/clang380-import/sys/conf/options Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/conf/options Mon Feb 22 22:21:53 2016 (r295902) @@ -673,6 +673,9 @@ UPLCOM_INTR_INTERVAL opt_uplcom.h UVSCOM_DEFAULT_OPKTSIZE opt_uvscom.h UVSCOM_INTR_INTERVAL opt_uvscom.h +# options for the Realtek RTL8188*U/RTL8192CU driver (urtwn) +URTWN_WITHOUT_UCODE opt_urtwn.h + # Embedded system options INIT_PATH Modified: projects/clang380-import/sys/dev/altera/avgen/altera_avgen.c ============================================================================== --- projects/clang380-import/sys/dev/altera/avgen/altera_avgen.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/dev/altera/avgen/altera_avgen.c Mon Feb 22 22:21:53 2016 (r295902) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/resource.h> -#include <machine/vm.h> #include <vm/vm.h> Modified: projects/clang380-import/sys/dev/altera/avgen/altera_avgen_fdt.c ============================================================================== --- projects/clang380-import/sys/dev/altera/avgen/altera_avgen_fdt.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/dev/altera/avgen/altera_avgen_fdt.c Mon Feb 22 22:21:53 2016 (r295902) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/resource.h> -#include <machine/vm.h> #include <vm/vm.h> Modified: projects/clang380-import/sys/dev/altera/avgen/altera_avgen_nexus.c ============================================================================== --- projects/clang380-import/sys/dev/altera/avgen/altera_avgen_nexus.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/dev/altera/avgen/altera_avgen_nexus.c Mon Feb 22 22:21:53 2016 (r295902) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/resource.h> -#include <machine/vm.h> #include <vm/vm.h> Modified: projects/clang380-import/sys/dev/ce/if_ce.c ============================================================================== --- projects/clang380-import/sys/dev/ce/if_ce.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/dev/ce/if_ce.c Mon Feb 22 22:21:53 2016 (r295902) @@ -76,7 +76,6 @@ __FBSDID("$FreeBSD$"); #include <dev/ce/ceddk.h> #include <machine/cserial.h> #include <machine/resource.h> -#include <machine/pmap.h> /* If we don't have Cronyx's sppp version, we don't have fr support via sppp */ #ifndef PP_FR Modified: projects/clang380-import/sys/dev/cp/if_cp.c ============================================================================== --- projects/clang380-import/sys/dev/cp/if_cp.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/dev/cp/if_cp.c Mon Feb 22 22:21:53 2016 (r295902) @@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$"); #include <dev/cp/cpddk.h> #include <machine/cserial.h> #include <machine/resource.h> -#include <machine/pmap.h> /* If we don't have Cronyx's sppp version, we don't have fr support via sppp */ #ifndef PP_FR Modified: projects/clang380-import/sys/dev/drm/drmP.h ============================================================================== --- projects/clang380-import/sys/dev/drm/drmP.h Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/dev/drm/drmP.h Mon Feb 22 22:21:53 2016 (r295902) @@ -75,8 +75,6 @@ struct drm_file; #include <vm/vm_pager.h> #include <vm/vm_param.h> #include <vm/vm_phys.h> -#include <machine/param.h> -#include <machine/pmap.h> #include <machine/bus.h> #include <machine/resource.h> #if defined(__i386__) || defined(__amd64__) Modified: projects/clang380-import/sys/dev/drm2/drmP.h ============================================================================== --- projects/clang380-import/sys/dev/drm2/drmP.h Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/dev/drm2/drmP.h Mon Feb 22 22:21:53 2016 (r295902) @@ -76,8 +76,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_pager.h> #include <vm/vm_param.h> #include <vm/vm_phys.h> -#include <machine/param.h> -#include <machine/pmap.h> #include <machine/bus.h> #include <machine/resource.h> #if defined(__i386__) || defined(__amd64__) Modified: projects/clang380-import/sys/dev/fb/machfb.c ============================================================================== --- projects/clang380-import/sys/dev/fb/machfb.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/dev/fb/machfb.c Mon Feb 22 22:21:53 2016 (r295902) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/bus_private.h> #include <machine/ofw_machdep.h> -#include <machine/pmap.h> #include <machine/resource.h> #include <machine/sc_machdep.h> Modified: projects/clang380-import/sys/dev/hyperv/netvsc/hv_net_vsc.h ============================================================================== --- projects/clang380-import/sys/dev/hyperv/netvsc/hv_net_vsc.h Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/dev/hyperv/netvsc/hv_net_vsc.h Mon Feb 22 22:21:53 2016 (r295902) @@ -1026,11 +1026,12 @@ struct hn_tx_ring { #endif int hn_txdesc_cnt; int hn_txdesc_avail; - int hn_txeof; + int hn_has_txeof; int hn_sched_tx; + void (*hn_txeof)(struct hn_tx_ring *); struct taskqueue *hn_tx_taskq; - struct task hn_start_task; + struct task hn_tx_task; struct task hn_txeof_task; struct mtx hn_tx_lock; @@ -1086,7 +1087,6 @@ typedef struct hn_softc { extern int hv_promisc_mode; void netvsc_linkstatus_callback(struct hv_device *device_obj, uint32_t status); -void netvsc_xmit_completion(void *context); void hv_nv_on_receive_completion(struct hv_device *device, uint64_t tid, uint32_t status); netvsc_dev *hv_nv_on_device_add(struct hv_device *device, Modified: projects/clang380-import/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c ============================================================================== --- projects/clang380-import/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Mon Feb 22 22:16:32 2016 (r295901) +++ projects/clang380-import/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Mon Feb 22 22:21:53 2016 (r295902) @@ -100,7 +100,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/resource.h> #include <machine/frame.h> -#include <machine/vmparam.h> #include <sys/bus.h> #include <sys/rman.h> @@ -298,8 +297,8 @@ static int hn_create_tx_ring(struct hn_s static void hn_destroy_tx_ring(struct hn_tx_ring *); static int hn_create_tx_data(struct hn_softc *); static void hn_destroy_tx_data(struct hn_softc *); -static void hn_start_taskfunc(void *xsc, int pending); -static void hn_txeof_taskfunc(void *xsc, int pending); +static void hn_start_taskfunc(void *, int); +static void hn_start_txeof_taskfunc(void *, int); static void hn_stop_tx_tasks(struct hn_softc *); static int hn_encap(struct hn_tx_ring *, struct hn_txdesc *, struct mbuf **); static void hn_create_rx_data(struct hn_softc *sc); @@ -653,17 +652,10 @@ hn_txdesc_hold(struct hn_txdesc *txd) atomic_add_int(&txd->refs, 1); } -/* - * Send completion processing - * - * Note: It looks like offset 0 of buf is reserved to hold the softc - * pointer. The sc pointer is not currently needed in this function, and - * it is not presently populated by the TX function. - */ -void -netvsc_xmit_completion(void *context) +static void +hn_tx_done(void *xpkt) { - netvsc_packet *packet = context; + netvsc_packet *packet = xpkt; struct hn_txdesc *txd; struct hn_tx_ring *txr; @@ -671,7 +663,7 @@ netvsc_xmit_completion(void *context) packet->compl.send.send_completion_tid; txr = txd->txr; - txr->hn_txeof = 1; + txr->hn_has_txeof = 1; hn_txdesc_put(txr, txd); } @@ -691,11 +683,11 @@ netvsc_channel_rollup(struct hv_device * *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602222221.u1MMLrZP026272>