From owner-svn-src-projects@FreeBSD.ORG Fri Mar 28 21:24:18 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1866F12A; Fri, 28 Mar 2014 21:24:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0101F5FF; Fri, 28 Mar 2014 21:24:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2SLOHAh084582; Fri, 28 Mar 2014 21:24:17 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2SLODiH084553; Fri, 28 Mar 2014 21:24:13 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201403282124.s2SLODiH084553@svn.freebsd.org> From: Ed Maste Date: Fri, 28 Mar 2014 21:24:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r263883 - in projects/uefi: . bin/sh gnu/usr.bin lib/libc/capability lib/libc/gen lib/libc/sys lib/libmd sys/amd64/amd64 sys/conf sys/ia64/ia64 sys/x86/acpica usr.bin/clang usr.bin/kdump X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Mar 2014 21:24:18 -0000 Author: emaste Date: Fri Mar 28 21:24:12 2014 New Revision: 263883 URL: http://svnweb.freebsd.org/changeset/base/263883 Log: Merge ^/head@263882 Sponsored by: The FreeBSD Foundation Modified: projects/uefi/Makefile.inc1 projects/uefi/bin/sh/var.c projects/uefi/gnu/usr.bin/Makefile projects/uefi/lib/libc/capability/cap_rights_init.3 projects/uefi/lib/libc/gen/cap_rights_get.3 projects/uefi/lib/libc/gen/cap_sandboxed.3 projects/uefi/lib/libc/sys/cap_enter.2 projects/uefi/lib/libc/sys/cap_fcntls_limit.2 projects/uefi/lib/libc/sys/cap_ioctls_limit.2 projects/uefi/lib/libc/sys/cap_rights_limit.2 projects/uefi/lib/libmd/ripemd.3 projects/uefi/lib/libmd/sha.3 projects/uefi/lib/libmd/sha256.3 projects/uefi/lib/libmd/sha512.3 projects/uefi/sys/amd64/amd64/mp_machdep.c projects/uefi/sys/amd64/amd64/pmap.c projects/uefi/sys/conf/files projects/uefi/sys/ia64/ia64/mem.c projects/uefi/sys/x86/acpica/madt.c projects/uefi/usr.bin/clang/Makefile projects/uefi/usr.bin/kdump/kdump.1 projects/uefi/usr.bin/kdump/kdump.c Directory Properties: projects/uefi/ (props changed) projects/uefi/lib/libc/ (props changed) projects/uefi/sys/ (props changed) projects/uefi/sys/conf/ (props changed) Modified: projects/uefi/Makefile.inc1 ============================================================================== --- projects/uefi/Makefile.inc1 Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/Makefile.inc1 Fri Mar 28 21:24:12 2014 (r263883) @@ -1899,7 +1899,7 @@ CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN} CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN} -XDDESTDIR=${DESTDIR}/${XDTP} +XDDESTDIR?=${DESTDIR}/${XDTP} .if !defined(OSREL) OSREL!= uname -r | sed -e 's/[-(].*//' .endif Modified: projects/uefi/bin/sh/var.c ============================================================================== --- projects/uefi/bin/sh/var.c Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/bin/sh/var.c Fri Mar 28 21:24:12 2014 (r263883) @@ -325,10 +325,16 @@ setvareq(char *s, int flags) mklocal(s); vp = find_var(s, &vpp, &nlen); if (vp != NULL) { - if (vp->flags & VREADONLY) + if (vp->flags & VREADONLY) { + if ((flags & (VTEXTFIXED|VSTACK)) == 0) + ckfree(s); error("%.*s: is read only", vp->name_len, s); - if (flags & VNOSET) + } + if (flags & VNOSET) { + if ((flags & (VTEXTFIXED|VSTACK)) == 0) + ckfree(s); return; + } INTOFF; if (vp->func && (flags & VNOFUNC) == 0) @@ -361,8 +367,11 @@ setvareq(char *s, int flags) return; } /* not found */ - if (flags & VNOSET) + if (flags & VNOSET) { + if ((flags & (VTEXTFIXED|VSTACK)) == 0) + ckfree(s); return; + } INTOFF; vp = ckmalloc(sizeof (*vp)); vp->flags = flags; Modified: projects/uefi/gnu/usr.bin/Makefile ============================================================================== --- projects/uefi/gnu/usr.bin/Makefile Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/gnu/usr.bin/Makefile Fri Mar 28 21:24:12 2014 (r263883) @@ -46,4 +46,6 @@ _cc= cc _gdb= gdb .endif +SUBDIR_PARALLEL= + .include Modified: projects/uefi/lib/libc/capability/cap_rights_init.3 ============================================================================== --- projects/uefi/lib/libc/capability/cap_rights_init.3 Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/lib/libc/capability/cap_rights_init.3 Fri Mar 28 21:24:12 2014 (r263883) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 23, 2013 +.Dd March 27, 2014 .Dt CAP_RIGHTS_INIT 3 .Os .Sh NAME @@ -44,7 +44,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/capability.h +.In sys/capsicum.h .Ft cap_rights_t * .Fn cap_rights_init "cap_rights_t *rights" "..." .Ft cap_rights_t * Modified: projects/uefi/lib/libc/gen/cap_rights_get.3 ============================================================================== --- projects/uefi/lib/libc/gen/cap_rights_get.3 Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/lib/libc/gen/cap_rights_get.3 Fri Mar 28 21:24:12 2014 (r263883) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 23, 2013 +.Dd March 27, 2014 .Dt CAP_RIGHTS_GET 3 .Os .Sh NAME @@ -37,7 +37,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/capability.h +.In sys/capsicum.h .Ft int .Fn cap_rights_get "int fd" "cap_rights_t *rights" .Sh DESCRIPTION Modified: projects/uefi/lib/libc/gen/cap_sandboxed.3 ============================================================================== --- projects/uefi/lib/libc/gen/cap_sandboxed.3 Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/lib/libc/gen/cap_sandboxed.3 Fri Mar 28 21:24:12 2014 (r263883) @@ -1,3 +1,4 @@ +.\" .\" Copyright (c) 2012 The FreeBSD Foundation .\" All rights reserved. .\" @@ -27,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 18, 2012 +.Dd March 27, 2014 .Dt CAP_SANDBOXED 3 .Os .Sh NAME @@ -36,7 +37,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/capability.h +.In sys/capsicum.h .In stdbool.h .Ft bool .Fn cap_sandboxed "void" Modified: projects/uefi/lib/libc/sys/cap_enter.2 ============================================================================== --- projects/uefi/lib/libc/sys/cap_enter.2 Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/lib/libc/sys/cap_enter.2 Fri Mar 28 21:24:12 2014 (r263883) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 25, 2012 +.Dd March 27, 2014 .Dt CAP_ENTER 2 .Os .Sh NAME @@ -38,7 +38,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/capability.h +.In sys/capsicum.h .Ft int .Fn cap_enter "void" .Ft int Modified: projects/uefi/lib/libc/sys/cap_fcntls_limit.2 ============================================================================== --- projects/uefi/lib/libc/sys/cap_fcntls_limit.2 Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/lib/libc/sys/cap_fcntls_limit.2 Fri Mar 28 21:24:12 2014 (r263883) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 20, 2012 +.Dd March 27, 2014 .Dt CAP_FCNTLS_LIMIT 2 .Os .Sh NAME @@ -38,7 +38,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/capability.h +.In sys/capsicum.h .Ft int .Fn cap_fcntls_limit "int fd" "uint32_t fcntlrights" .Ft int Modified: projects/uefi/lib/libc/sys/cap_ioctls_limit.2 ============================================================================== --- projects/uefi/lib/libc/sys/cap_ioctls_limit.2 Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/lib/libc/sys/cap_ioctls_limit.2 Fri Mar 28 21:24:12 2014 (r263883) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 20, 2012 +.Dd March 27, 2014 .Dt CAP_IOCTLS_LIMIT 2 .Os .Sh NAME @@ -38,7 +38,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/capability.h +.In sys/capsicum.h .Ft int .Fn cap_ioctls_limit "int fd" "const unsigned long *cmds" "size_t ncmds" .Ft ssize_t Modified: projects/uefi/lib/libc/sys/cap_rights_limit.2 ============================================================================== --- projects/uefi/lib/libc/sys/cap_rights_limit.2 Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/lib/libc/sys/cap_rights_limit.2 Fri Mar 28 21:24:12 2014 (r263883) @@ -32,7 +32,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 23, 2013 +.Dd March 27, 2014 .Dt CAP_RIGHTS_LIMIT 2 .Os .Sh NAME @@ -41,7 +41,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/capability.h +.In sys/capsicum.h .Ft int .Fn cap_rights_limit "int fd" "const cap_rights_t *rights" .Sh DESCRIPTION Modified: projects/uefi/lib/libmd/ripemd.3 ============================================================================== --- projects/uefi/lib/libmd/ripemd.3 Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/lib/libmd/ripemd.3 Fri Mar 28 21:24:12 2014 (r263883) @@ -9,7 +9,7 @@ .\" From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp .\" $FreeBSD$ .\" -.Dd February 26, 1999 +.Dd March 28, 2014 .Dt RIPEMD 3 .Os .Sh NAME @@ -123,7 +123,6 @@ If the .Fa buf argument is non-null it must point to at least 41 characters of buffer space. .Sh SEE ALSO -.Xr md2 3 , .Xr md4 3 , .Xr md5 3 , .Xr sha 3 Modified: projects/uefi/lib/libmd/sha.3 ============================================================================== --- projects/uefi/lib/libmd/sha.3 Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/lib/libmd/sha.3 Fri Mar 28 21:24:12 2014 (r263883) @@ -9,7 +9,7 @@ .\" From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp .\" $FreeBSD$ .\" -.Dd February 25, 1999 +.Dd March 28, 2014 .Dt SHA 3 .Os .Sh NAME @@ -154,7 +154,6 @@ If the .Fa buf argument is non-null it must point to at least 41 characters of buffer space. .Sh SEE ALSO -.Xr md2 3 , .Xr md4 3 , .Xr md5 3 , .Xr ripemd 3 , Modified: projects/uefi/lib/libmd/sha256.3 ============================================================================== --- projects/uefi/lib/libmd/sha256.3 Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/lib/libmd/sha256.3 Fri Mar 28 21:24:12 2014 (r263883) @@ -9,7 +9,7 @@ .\" From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp .\" $FreeBSD$ .\" -.Dd September 14, 2005 +.Dd March 28, 2014 .Dt SHA256 3 .Os .Sh NAME @@ -120,7 +120,6 @@ If the .Fa buf argument is non-null it must point to at least 65 characters of buffer space. .Sh SEE ALSO -.Xr md2 3 , .Xr md4 3 , .Xr md5 3 , .Xr ripemd 3 , Modified: projects/uefi/lib/libmd/sha512.3 ============================================================================== --- projects/uefi/lib/libmd/sha512.3 Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/lib/libmd/sha512.3 Fri Mar 28 21:24:12 2014 (r263883) @@ -9,7 +9,7 @@ .\" From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp .\" $FreeBSD$ .\" -.Dd April 1, 2011 +.Dd March 28, 2014 .Dt SHA512 3 .Os .Sh NAME @@ -120,7 +120,6 @@ If the .Fa buf argument is non-null it must point to at least 65 characters of buffer space. .Sh SEE ALSO -.Xr md2 3 , .Xr md4 3 , .Xr md5 3 , .Xr ripemd 3 , Modified: projects/uefi/sys/amd64/amd64/mp_machdep.c ============================================================================== --- projects/uefi/sys/amd64/amd64/mp_machdep.c Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/sys/amd64/amd64/mp_machdep.c Fri Mar 28 21:24:12 2014 (r263883) @@ -1257,7 +1257,7 @@ smp_masked_invltlb(cpuset_t mask, pmap_t { if (smp_started) { - smp_targeted_tlb_shootdown(mask, IPI_INVLTLB, NULL, 0, 0); + smp_targeted_tlb_shootdown(mask, IPI_INVLTLB, pmap, 0, 0); #ifdef COUNT_XINVLTLB_HITS ipi_masked_global++; #endif @@ -1517,6 +1517,7 @@ void invltlb_pcid_handler(void) { uint64_t cr3; + u_int cpuid; #ifdef COUNT_XINVLTLB_HITS xhits_gbl[PCPU_GET(cpuid)]++; #endif /* COUNT_XINVLTLB_HITS */ @@ -1524,14 +1525,13 @@ invltlb_pcid_handler(void) (*ipi_invltlb_counts[PCPU_GET(cpuid)])++; #endif /* COUNT_IPIS */ - cr3 = rcr3(); if (smp_tlb_invpcid.pcid != (uint64_t)-1 && smp_tlb_invpcid.pcid != 0) { - if (invpcid_works) { invpcid(&smp_tlb_invpcid, INVPCID_CTX); } else { /* Otherwise reload %cr3 twice. */ + cr3 = rcr3(); if (cr3 != pcid_cr3) { load_cr3(pcid_cr3); cr3 |= CR3_PCID_SAVE; @@ -1541,8 +1541,11 @@ invltlb_pcid_handler(void) } else { invltlb_globpcid(); } - if (smp_tlb_pmap != NULL) - CPU_CLR_ATOMIC(PCPU_GET(cpuid), &smp_tlb_pmap->pm_save); + if (smp_tlb_pmap != NULL) { + cpuid = PCPU_GET(cpuid); + if (!CPU_ISSET(cpuid, &smp_tlb_pmap->pm_active)) + CPU_CLR_ATOMIC(cpuid, &smp_tlb_pmap->pm_save); + } atomic_add_int(&smp_tlb_wait, 1); } @@ -1608,7 +1611,10 @@ invlpg_range(vm_offset_t start, vm_offse void invlrng_handler(void) { + struct invpcid_descr d; vm_offset_t addr; + uint64_t cr3; + u_int cpuid; #ifdef COUNT_XINVLTLB_HITS xhits_rng[PCPU_GET(cpuid)]++; #endif /* COUNT_XINVLTLB_HITS */ @@ -1618,15 +1624,7 @@ invlrng_handler(void) addr = smp_tlb_invpcid.addr; if (pmap_pcid_enabled) { - if (invpcid_works) { - struct invpcid_descr d; - - d = smp_tlb_invpcid; - do { - invpcid(&d, INVPCID_ADDR); - d.addr += PAGE_SIZE; - } while (d.addr < smp_tlb_addr2); - } else if (smp_tlb_invpcid.pcid == 0) { + if (smp_tlb_invpcid.pcid == 0) { /* * kernel pmap - use invlpg to invalidate * global mapping. @@ -1635,12 +1633,18 @@ invlrng_handler(void) } else if (smp_tlb_invpcid.pcid == (uint64_t)-1) { invltlb_globpcid(); if (smp_tlb_pmap != NULL) { - CPU_CLR_ATOMIC(PCPU_GET(cpuid), - &smp_tlb_pmap->pm_save); + cpuid = PCPU_GET(cpuid); + if (!CPU_ISSET(cpuid, &smp_tlb_pmap->pm_active)) + CPU_CLR_ATOMIC(cpuid, + &smp_tlb_pmap->pm_save); } + } else if (invpcid_works) { + d = smp_tlb_invpcid; + do { + invpcid(&d, INVPCID_ADDR); + d.addr += PAGE_SIZE; + } while (d.addr <= smp_tlb_addr2); } else { - uint64_t cr3; - cr3 = rcr3(); if (cr3 != pcid_cr3) load_cr3(pcid_cr3 | CR3_PCID_SAVE); Modified: projects/uefi/sys/amd64/amd64/pmap.c ============================================================================== --- projects/uefi/sys/amd64/amd64/pmap.c Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/sys/amd64/amd64/pmap.c Fri Mar 28 21:24:12 2014 (r263883) @@ -833,7 +833,7 @@ pmap_bootstrap(vm_paddr_t *firstaddr) kernel_pmap->pm_pml4 = (pdp_entry_t *)PHYS_TO_DMAP(KPML4phys); kernel_pmap->pm_cr3 = KPML4phys; CPU_FILL(&kernel_pmap->pm_active); /* don't allow deactivation */ - CPU_ZERO(&kernel_pmap->pm_save); + CPU_FILL(&kernel_pmap->pm_save); /* always superset of pm_active */ TAILQ_INIT(&kernel_pmap->pm_pvchunk); kernel_pmap->pm_flags = pmap_flags; @@ -1489,7 +1489,8 @@ pmap_invalidate_all(pmap_t pmap) } else { invltlb_globpcid(); } - CPU_CLR_ATOMIC(cpuid, &pmap->pm_save); + if (!CPU_ISSET(cpuid, &pmap->pm_active)) + CPU_CLR_ATOMIC(cpuid, &pmap->pm_save); smp_invltlb(pmap); } else { other_cpus = all_cpus; @@ -1523,7 +1524,8 @@ pmap_invalidate_all(pmap_t pmap) } } else if (CPU_ISSET(cpuid, &pmap->pm_active)) invltlb(); - CPU_CLR_ATOMIC(cpuid, &pmap->pm_save); + if (!CPU_ISSET(cpuid, &pmap->pm_active)) + CPU_CLR_ATOMIC(cpuid, &pmap->pm_save); if (pmap_pcid_enabled) CPU_AND(&other_cpus, &pmap->pm_save); else Modified: projects/uefi/sys/conf/files ============================================================================== --- projects/uefi/sys/conf/files Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/sys/conf/files Fri Mar 28 21:24:12 2014 (r263883) @@ -2471,7 +2471,7 @@ dev/vr/if_vr.c optional vr pci dev/vt/colors/vt_termcolors.c optional vt dev/vt/font/vt_font_default.c optional vt dev/vt/font/vt_mouse_cursor.c optional vt -dev/vt/hw/efifb/efifb.c optional vt +dev/vt/hw/efifb/efifb.c optional vt_efifb dev/vt/hw/fb/vt_fb.c optional vt dev/vt/hw/vga/vga.c optional vt vt_vga dev/vt/logo/logo_freebsd.c optional vt splash Modified: projects/uefi/sys/ia64/ia64/mem.c ============================================================================== --- projects/uefi/sys/ia64/ia64/mem.c Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/sys/ia64/ia64/mem.c Fri Mar 28 21:24:12 2014 (r263883) @@ -45,13 +45,13 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include #include #include #include -#include #include #include Modified: projects/uefi/sys/x86/acpica/madt.c ============================================================================== --- projects/uefi/sys/x86/acpica/madt.c Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/sys/x86/acpica/madt.c Fri Mar 28 21:24:12 2014 (r263883) @@ -298,6 +298,9 @@ interrupt_polarity(UINT16 IntiFlags, UIN { switch (IntiFlags & ACPI_MADT_POLARITY_MASK) { + default: + printf("WARNING: Bogus Interrupt Polarity. Assume CONFORMS"); + /* FALLTHROUGH*/ case ACPI_MADT_POLARITY_CONFORMS: if (Source == AcpiGbl_FADT.SciInterrupt) return (INTR_POLARITY_LOW); @@ -306,11 +309,8 @@ interrupt_polarity(UINT16 IntiFlags, UIN case ACPI_MADT_POLARITY_ACTIVE_HIGH: return (INTR_POLARITY_HIGH); case ACPI_MADT_POLARITY_ACTIVE_LOW: - break; - default: - printf("WARNING: Bogus Interrupt Polarity. Assume POLALITY LOW"); + return (INTR_POLARITY_LOW); } - return (INTR_POLARITY_LOW); } static enum intr_trigger @@ -318,6 +318,9 @@ interrupt_trigger(UINT16 IntiFlags, UINT { switch (IntiFlags & ACPI_MADT_TRIGGER_MASK) { + default: + printf("WARNING: Bogus Interrupt Trigger Mode. Assume CONFORMS."); + /*FALLTHROUGH*/ case ACPI_MADT_TRIGGER_CONFORMS: if (Source == AcpiGbl_FADT.SciInterrupt) return (INTR_TRIGGER_LEVEL); @@ -326,13 +329,8 @@ interrupt_trigger(UINT16 IntiFlags, UINT case ACPI_MADT_TRIGGER_EDGE: return (INTR_TRIGGER_EDGE); case ACPI_MADT_TRIGGER_LEVEL: - break; - default: - printf("WARNING: Bogus Interrupt Trigger Mode. Assume Level trigger."); - - break; + return (INTR_TRIGGER_LEVEL); } - return (INTR_TRIGGER_LEVEL); } /* Modified: projects/uefi/usr.bin/clang/Makefile ============================================================================== --- projects/uefi/usr.bin/clang/Makefile Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/usr.bin/clang/Makefile Fri Mar 28 21:24:12 2014 (r263883) @@ -29,4 +29,6 @@ SUBDIR+=lldb .endif .endif # TOOLS_PREFIX +SUBDIR_PARALLEL= + .include Modified: projects/uefi/usr.bin/kdump/kdump.1 ============================================================================== --- projects/uefi/usr.bin/kdump/kdump.1 Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/usr.bin/kdump/kdump.1 Fri Mar 28 21:24:12 2014 (r263883) @@ -28,7 +28,7 @@ .\" @(#)kdump.1 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd June 4, 2012 +.Dd March 28, 2014 .Dt KDUMP 1 .Os .Sh NAME @@ -36,7 +36,7 @@ .Nd display kernel trace data .Sh SYNOPSIS .Nm -.Op Fl dEnlHRsTA +.Op Fl dEnlHRSsTA .Op Fl f Ar trfile .Op Fl m Ar maxdata .Op Fl p Ar pid @@ -95,6 +95,8 @@ Display relative timestamps (time since .It Fl r When decoding STRU records, display structure members such as UIDs, GIDs, dates etc. symbolically instead of numerically. +.It Fl S +Display system call numbers. .It Fl s Suppress display of I/O data. .It Fl T Modified: projects/uefi/usr.bin/kdump/kdump.c ============================================================================== --- projects/uefi/usr.bin/kdump/kdump.c Fri Mar 28 20:12:30 2014 (r263882) +++ projects/uefi/usr.bin/kdump/kdump.c Fri Mar 28 21:24:12 2014 (r263883) @@ -123,7 +123,7 @@ void ioctlname(unsigned long, int); #define TIMESTAMP_RELATIVE 0x4 int timestamp, decimal, fancy = 1, suppressdata, tail, threads, maxdata, - resolv = 0, abiflag = 0; + resolv = 0, abiflag = 0, syscallno = 0; const char *tracefile = DEF_TRACEFILE; struct ktr_header ktr_header; @@ -261,7 +261,7 @@ main(int argc, char *argv[]) timestamp = TIMESTAMP_NONE; - while ((ch = getopt(argc,argv,"f:dElm:np:AHRrsTt:")) != -1) + while ((ch = getopt(argc,argv,"f:dElm:np:AHRrSsTt:")) != -1) switch (ch) { case 'A': abiflag = 1; @@ -287,6 +287,9 @@ main(int argc, char *argv[]) case 'r': resolv = 1; break; + case 'S': + syscallno = 1; + break; case 's': suppressdata = 1; break; @@ -678,8 +681,11 @@ ktrsyscall(struct ktr_syscall *ktr, u_in if ((flags != 0 && ((flags & SV_ABI_MASK) != SV_ABI_FREEBSD)) || (ktr->ktr_code >= nsyscalls || ktr->ktr_code < 0)) printf("[%d]", ktr->ktr_code); - else + else { printf("%s", syscallnames[ktr->ktr_code]); + if (syscallno) + printf("[%d]", ktr->ktr_code); + } ip = &ktr->ktr_args[0]; if (narg) { char c = '('; @@ -1271,8 +1277,12 @@ ktrsysret(struct ktr_sysret *ktr, u_int if ((flags != 0 && ((flags & SV_ABI_MASK) != SV_ABI_FREEBSD)) || (code >= nsyscalls || code < 0)) printf("[%d] ", code); - else - printf("%s ", syscallnames[code]); + else { + printf("%s", syscallnames[code]); + if (syscallno) + printf("[%d]", code); + printf(" "); + } if (error == 0) { if (fancy) { @@ -1910,8 +1920,11 @@ linux_ktrsyscall(struct ktr_syscall *ktr if (ktr->ktr_code >= nlinux_syscalls || ktr->ktr_code < 0) printf("[%d]", ktr->ktr_code); - else + else { printf("%s", linux_syscallnames[ktr->ktr_code]); + if (syscallno) + printf("[%d]", ktr->ktr_code); + } ip = &ktr->ktr_args[0]; if (narg) { char c = '('; @@ -1931,8 +1944,12 @@ linux_ktrsysret(struct ktr_sysret *ktr) if (code >= nlinux_syscalls || code < 0) printf("[%d] ", code); - else - printf("%s ", linux_syscallnames[code]); + else { + printf("%s", linux_syscallnames[code]); + if (syscallno) + printf("[%d]", code); + printf(" "); + } if (error == 0) { if (fancy) { @@ -1965,7 +1982,7 @@ linux_ktrsysret(struct ktr_sysret *ktr) void usage(void) { - fprintf(stderr, "usage: kdump [-dEnlHRrsTA] [-f trfile] " + fprintf(stderr, "usage: kdump [-dEnlHRrSsTA] [-f trfile] " "[-m maxdata] [-p pid] [-t trstr]\n"); exit(1); }