Date: Mon, 25 Nov 2013 10:49:18 +0000 (UTC) From: Mark Murray <markm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r258544 - in projects/random_number_generator: bin/sh contrib/gcclibs/libcpp include lib/libc/iconv lib/libiconv_modules/iconv_std sys/amd64/amd64 sys/amd64/linux32 sys/arm/include sys/... Message-ID: <201311251049.rAPAnIKq096775@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markm Date: Mon Nov 25 10:49:17 2013 New Revision: 258544 URL: http://svnweb.freebsd.org/changeset/base/258544 Log: MFC - tracking commit. Added: projects/random_number_generator/contrib/gcclibs/libcpp/ChangeLog.gcc43 - copied unchanged from r258543, head/contrib/gcclibs/libcpp/ChangeLog.gcc43 projects/random_number_generator/tools/regression/bin/sh/execution/bg10.0 - copied unchanged from r258543, head/tools/regression/bin/sh/execution/bg10.0 projects/random_number_generator/tools/regression/bin/sh/execution/bg10.0.stdout - copied unchanged from r258543, head/tools/regression/bin/sh/execution/bg10.0.stdout projects/random_number_generator/tools/regression/bin/sh/execution/bg7.0 - copied unchanged from r258543, head/tools/regression/bin/sh/execution/bg7.0 projects/random_number_generator/tools/regression/bin/sh/execution/bg8.0 - copied unchanged from r258543, head/tools/regression/bin/sh/execution/bg8.0 projects/random_number_generator/tools/regression/bin/sh/execution/bg9.0 - copied unchanged from r258543, head/tools/regression/bin/sh/execution/bg9.0 Modified: projects/random_number_generator/bin/sh/redir.c projects/random_number_generator/include/iconv.h projects/random_number_generator/lib/libc/iconv/citrus_iconv_local.h projects/random_number_generator/lib/libc/iconv/iconv.c projects/random_number_generator/lib/libc/iconv/iconvctl.3 projects/random_number_generator/lib/libiconv_modules/iconv_std/citrus_iconv_std.c projects/random_number_generator/sys/amd64/amd64/exception.S projects/random_number_generator/sys/amd64/amd64/machdep.c projects/random_number_generator/sys/amd64/amd64/trap.c projects/random_number_generator/sys/amd64/linux32/linux32_dummy.c projects/random_number_generator/sys/arm/include/machdep.h projects/random_number_generator/sys/arm/mv/mv_machdep.c projects/random_number_generator/sys/arm/s3c2xx0/s3c24x0_machdep.c projects/random_number_generator/sys/boot/arm/uboot/start.S projects/random_number_generator/sys/cam/ctl/ctl_backend_block.c projects/random_number_generator/sys/cddl/dev/dtrace/dtrace_test.c projects/random_number_generator/sys/cddl/dev/lockstat/lockstat.c projects/random_number_generator/sys/cddl/dev/sdt/sdt.c projects/random_number_generator/sys/compat/linux/linux_emul.c projects/random_number_generator/sys/compat/linux/linux_fork.c projects/random_number_generator/sys/compat/linux/linux_futex.c projects/random_number_generator/sys/compat/linux/linux_mib.c projects/random_number_generator/sys/compat/linux/linux_misc.c projects/random_number_generator/sys/compat/linux/linux_sysctl.c projects/random_number_generator/sys/compat/linux/linux_time.c projects/random_number_generator/sys/compat/linux/linux_uid16.c projects/random_number_generator/sys/compat/linux/linux_util.c projects/random_number_generator/sys/conf/options projects/random_number_generator/sys/dev/sfxge/common/efsys.h projects/random_number_generator/sys/dev/xen/blkback/blkback.c projects/random_number_generator/sys/fs/nfs/nfs_commonkrpc.c projects/random_number_generator/sys/fs/nfsclient/nfs_clbio.c projects/random_number_generator/sys/fs/nfsclient/nfs_clnode.c projects/random_number_generator/sys/fs/nfsclient/nfs_clport.c projects/random_number_generator/sys/fs/nfsclient/nfs_clsubs.c projects/random_number_generator/sys/fs/nfsclient/nfs_clvnops.c projects/random_number_generator/sys/i386/i386/exception.s projects/random_number_generator/sys/i386/i386/machdep.c projects/random_number_generator/sys/i386/i386/trap.c projects/random_number_generator/sys/i386/linux/linux_dummy.c projects/random_number_generator/sys/kern/kern_clock.c projects/random_number_generator/sys/kern/kern_clocksource.c projects/random_number_generator/sys/kern/kern_exec.c projects/random_number_generator/sys/kern/kern_exit.c projects/random_number_generator/sys/kern/kern_fork.c projects/random_number_generator/sys/kern/kern_lock.c projects/random_number_generator/sys/kern/kern_lockstat.c projects/random_number_generator/sys/kern/kern_malloc.c projects/random_number_generator/sys/kern/kern_mutex.c projects/random_number_generator/sys/kern/kern_priv.c projects/random_number_generator/sys/kern/kern_proc.c projects/random_number_generator/sys/kern/kern_racct.c projects/random_number_generator/sys/kern/kern_rmlock.c projects/random_number_generator/sys/kern/kern_rwlock.c projects/random_number_generator/sys/kern/kern_sdt.c projects/random_number_generator/sys/kern/kern_sig.c projects/random_number_generator/sys/kern/kern_sx.c projects/random_number_generator/sys/kern/kern_synch.c projects/random_number_generator/sys/kern/kern_thread.c projects/random_number_generator/sys/kern/kern_timeout.c projects/random_number_generator/sys/kern/sched_4bsd.c projects/random_number_generator/sys/kern/sched_ule.c projects/random_number_generator/sys/kern/subr_devstat.c projects/random_number_generator/sys/kern/subr_sleepqueue.c projects/random_number_generator/sys/kern/subr_syscall.c projects/random_number_generator/sys/kern/subr_trap.c projects/random_number_generator/sys/kern/subr_turnstile.c projects/random_number_generator/sys/kern/vfs_cache.c projects/random_number_generator/sys/kern/vfs_lookup.c projects/random_number_generator/sys/kern/vfs_syscalls.c projects/random_number_generator/sys/mips/mips/exception.S projects/random_number_generator/sys/mips/mips/trap.c projects/random_number_generator/sys/modules/crypto/Makefile projects/random_number_generator/sys/modules/ctl/Makefile projects/random_number_generator/sys/modules/dtrace/dtrace_test/Makefile projects/random_number_generator/sys/modules/dtrace/lockstat/Makefile projects/random_number_generator/sys/modules/dtrace/sdt/Makefile projects/random_number_generator/sys/modules/ip6_mroute_mod/Makefile projects/random_number_generator/sys/modules/linux/Makefile projects/random_number_generator/sys/modules/nfscl/Makefile projects/random_number_generator/sys/modules/nfsclient/Makefile projects/random_number_generator/sys/modules/nfscommon/Makefile projects/random_number_generator/sys/modules/send/Makefile projects/random_number_generator/sys/net/vnet.c projects/random_number_generator/sys/netinet/in_kdtrace.c projects/random_number_generator/sys/netinet/ip_fastfwd.c projects/random_number_generator/sys/netinet/ip_input.c projects/random_number_generator/sys/netinet/ip_output.c projects/random_number_generator/sys/netinet/sctp_dtrace_declare.h projects/random_number_generator/sys/netinet/sctp_dtrace_define.h projects/random_number_generator/sys/netinet/tcp_input.c projects/random_number_generator/sys/netinet/tcp_output.c projects/random_number_generator/sys/netinet/tcp_subr.c projects/random_number_generator/sys/netinet/udp_usrreq.c projects/random_number_generator/sys/netinet6/ip6_input.c projects/random_number_generator/sys/netinet6/ip6_mroute.c projects/random_number_generator/sys/netinet6/nd6.c projects/random_number_generator/sys/netinet6/send.c projects/random_number_generator/sys/netinet6/udp6_usrreq.c projects/random_number_generator/sys/nfsclient/nfs_bio.c projects/random_number_generator/sys/nfsclient/nfs_krpc.c projects/random_number_generator/sys/nfsclient/nfs_subs.c projects/random_number_generator/sys/nfsclient/nfs_vnops.c projects/random_number_generator/sys/opencrypto/crypto.c projects/random_number_generator/sys/opencrypto/deflate.c projects/random_number_generator/sys/pc98/pc98/machdep.c projects/random_number_generator/sys/powerpc/aim/locore32.S projects/random_number_generator/sys/powerpc/aim/locore64.S projects/random_number_generator/sys/powerpc/aim/trap.c projects/random_number_generator/sys/security/mac/mac_audit.c projects/random_number_generator/sys/security/mac/mac_cred.c projects/random_number_generator/sys/security/mac/mac_framework.c projects/random_number_generator/sys/security/mac/mac_inet.c projects/random_number_generator/sys/security/mac/mac_net.c projects/random_number_generator/sys/security/mac/mac_pipe.c projects/random_number_generator/sys/security/mac/mac_posix_sem.c projects/random_number_generator/sys/security/mac/mac_posix_shm.c projects/random_number_generator/sys/security/mac/mac_priv.c projects/random_number_generator/sys/security/mac/mac_process.c projects/random_number_generator/sys/security/mac/mac_socket.c projects/random_number_generator/sys/security/mac/mac_system.c projects/random_number_generator/sys/security/mac/mac_sysv_msg.c projects/random_number_generator/sys/security/mac/mac_sysv_sem.c projects/random_number_generator/sys/security/mac/mac_sysv_shm.c projects/random_number_generator/sys/security/mac/mac_vfs.c projects/random_number_generator/sys/sys/mutex.h projects/random_number_generator/sys/sys/rwlock.h projects/random_number_generator/sys/sys/sx.h projects/random_number_generator/sys/tools/vnode_if.awk projects/random_number_generator/sys/x86/x86/local_apic.c Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/lib/libc/ (props changed) projects/random_number_generator/sys/ (props changed) projects/random_number_generator/sys/boot/ (props changed) projects/random_number_generator/sys/conf/ (props changed) Modified: projects/random_number_generator/bin/sh/redir.c ============================================================================== --- projects/random_number_generator/bin/sh/redir.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/bin/sh/redir.c Mon Nov 25 10:49:17 2013 (r258544) @@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$"); struct redirtab { struct redirtab *next; int renamed[10]; + int fd0_redirected; }; @@ -109,11 +110,14 @@ redirect(union node *redir, int flags) sv = ckmalloc(sizeof (struct redirtab)); for (i = 0 ; i < 10 ; i++) sv->renamed[i] = EMPTY; + sv->fd0_redirected = fd0_redirected; sv->next = redirlist; redirlist = sv; } for (n = redir ; n ; n = n->nfile.next) { fd = n->nfile.fd; + if (fd == 0) + fd0_redirected = 1; if ((n->nfile.type == NTOFD || n->nfile.type == NFROMFD) && n->ndup.dupfd == fd) continue; /* redirect from/to same file descriptor */ @@ -134,8 +138,6 @@ redirect(union node *redir, int flags) sv->renamed[fd] = i; INTON; } - if (fd == 0) - fd0_redirected++; openredirect(n, memory); } if (memory[1]) @@ -303,8 +305,6 @@ popredir(void) for (i = 0 ; i < 10 ; i++) { if (rp->renamed[i] != EMPTY) { - if (i == 0) - fd0_redirected--; if (rp->renamed[i] >= 0) { dup2(rp->renamed[i], i); close(rp->renamed[i]); @@ -314,6 +314,7 @@ popredir(void) } } INTOFF; + fd0_redirected = rp->fd0_redirected; redirlist = rp->next; ckfree(rp); INTON; Copied: projects/random_number_generator/contrib/gcclibs/libcpp/ChangeLog.gcc43 (from r258543, head/contrib/gcclibs/libcpp/ChangeLog.gcc43) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/random_number_generator/contrib/gcclibs/libcpp/ChangeLog.gcc43 Mon Nov 25 10:49:17 2013 (r258544, copy of r258543, head/contrib/gcclibs/libcpp/ChangeLog.gcc43) @@ -0,0 +1,29 @@ +2007-06-05 Joerg Wunsch <j.gnu@uriah.heep.sax.de> (r250566) + + PR preprocessor/23479 + * expr.c (cpp_classify_number): Implement 0b-prefixed binary + integer constants. + (append_digit): Likewise. + * include/cpplib.h: Add CPP_N_BINARY, to be used for 0b-prefixed + binary integer constants. + +2007-05-21 Ian Lance Taylor <iant@google.com> (r124929) + + * internal.h (struct cpp_reader): Add new fields: + nonexistent_file_hash and nonexistent_file_ob. + * files.c: Include "obstack.h". + (find_file_in_dir): Before trying to open the file, look up the + path name in the hash table of nonexistent files. After failing + to open the file, add the path name to the hash table. + (_cpp_find_file): Cache the results of looking up the file name + starting with the quote and bracket chain heads, if we can. + (nonexistent_file_hash_eq): New static function. + (_cpp_init_files): Initialize pfile->nonexistent_file_hash and + pfile->nonexistent_file_ob. + (_cpp_cleanup_files): Free pfile->nonexistent_file_hash and + pfile->nonexistent_file_ob. + +2006-12-29 Ian Lance Taylor <iant@google.com> (r120263) + + * lex.c (_cpp_clean_line): Add uses of __builtin_expect. Don't + look backward at the end of the line unless we saw a backslash. Modified: projects/random_number_generator/include/iconv.h ============================================================================== --- projects/random_number_generator/include/iconv.h Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/include/iconv.h Mon Nov 25 10:49:17 2013 (r258544) @@ -86,6 +86,8 @@ void iconv_set_relocation_prefix(const #define ICONV_SET_DISCARD_ILSEQ 4 #define ICONV_SET_HOOKS 5 #define ICONV_SET_FALLBACKS 6 +#define ICONV_GET_ILSEQ_INVALID 128 +#define ICONV_SET_ILSEQ_INVALID 129 typedef void (*iconv_unicode_char_hook) (unsigned int mbr, void *data); typedef void (*iconv_wide_char_hook) (wchar_t wc, void *data); Modified: projects/random_number_generator/lib/libc/iconv/citrus_iconv_local.h ============================================================================== --- projects/random_number_generator/lib/libc/iconv/citrus_iconv_local.h Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/lib/libc/iconv/citrus_iconv_local.h Mon Nov 25 10:49:17 2013 (r258544) @@ -99,6 +99,7 @@ struct _citrus_iconv_shared { char *ci_convname; bool ci_discard_ilseq; struct iconv_hooks *ci_hooks; + bool ci_ilseq_invalid; }; struct _citrus_iconv { Modified: projects/random_number_generator/lib/libc/iconv/iconv.c ============================================================================== --- projects/random_number_generator/lib/libc/iconv/iconv.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/lib/libc/iconv/iconv.c Mon Nov 25 10:49:17 2013 (r258544) @@ -298,6 +298,12 @@ __bsd_iconvctl(iconv_t cd, int request, case ICONV_SET_FALLBACKS: errno = EOPNOTSUPP; return (-1); + case ICONV_GET_ILSEQ_INVALID: + *i = cv->cv_shared->ci_ilseq_invalid ? 1 : 0; + return (0); + case ICONV_SET_ILSEQ_INVALID: + cv->cv_shared->ci_ilseq_invalid = *i; + return (0); default: errno = EINVAL; return (-1); Modified: projects/random_number_generator/lib/libc/iconv/iconvctl.3 ============================================================================== --- projects/random_number_generator/lib/libc/iconv/iconvctl.3 Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/lib/libc/iconv/iconvctl.3 Mon Nov 25 10:49:17 2013 (r258544) @@ -34,7 +34,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 7, 2009 +.Dd November 25, 2009 .Dt ICONVCTL 3 .Os .Sh NAME @@ -110,6 +110,31 @@ variable, which is passed to via .Fa argument by its address. +.It ICONV_GET_ILSEQ_INVALID +Determines if a character in the input buffer that is valid, +but for which an identical character does not exist in the target +codeset returns +.Er EILSEQ +or not. +The answer is stored in +.Fa argument , +which is of +.Ft int * . +It will be set to 1 if this feature is enabled or set to 0 otherwise. +.It ICONV_SET_ILSEQ_INVALID +Sets whether a character in the input buffer that is valid, +but for which an identical character does not exist in the target +codeset returns +.Er EILSEQ +or not. +If +.Fa argument , +which is of +.Ft int * +is set to 1 it will be enabled, +and if +.Fa argument +is set to 0 it will be disabled. .El .\" XXX: fallbacks are unimplemented and trying to set them will always .\" return EOPNOTSUPP but definitions are provided for source-level Modified: projects/random_number_generator/lib/libiconv_modules/iconv_std/citrus_iconv_std.c ============================================================================== --- projects/random_number_generator/lib/libiconv_modules/iconv_std/citrus_iconv_std.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/lib/libiconv_modules/iconv_std/citrus_iconv_std.c Mon Nov 25 10:49:17 2013 (r258544) @@ -543,6 +543,16 @@ _citrus_iconv_std_iconv_convert(struct _ ret = do_conv(is, &csid, &idx); if (ret) { if (ret == E_NO_CORRESPONDING_CHAR) { + /* + * GNU iconv returns EILSEQ when no + * corresponding character in the output. + * Some software depends on this behavior + * though this is against POSIX specification. + */ + if (cv->cv_shared->ci_ilseq_invalid != 0) { + ret = EILSEQ; + goto err; + } inval++; szrout = 0; if ((((flags & _CITRUS_ICONV_F_HIDE_INVALID) == 0) && Modified: projects/random_number_generator/sys/amd64/amd64/exception.S ============================================================================== --- projects/random_number_generator/sys/amd64/amd64/exception.S Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/amd64/amd64/exception.S Mon Nov 25 10:49:17 2013 (r258544) @@ -37,7 +37,6 @@ #include "opt_atpic.h" #include "opt_compat.h" #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include <machine/asmacros.h> #include <machine/psl.h> Modified: projects/random_number_generator/sys/amd64/amd64/machdep.c ============================================================================== --- projects/random_number_generator/sys/amd64/amd64/machdep.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/amd64/amd64/machdep.c Mon Nov 25 10:49:17 2013 (r258544) @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include "opt_perfmon.h" #include "opt_platform.h" #include "opt_sched.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/proc.h> Modified: projects/random_number_generator/sys/amd64/amd64/trap.c ============================================================================== --- projects/random_number_generator/sys/amd64/amd64/trap.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/amd64/amd64/trap.c Mon Nov 25 10:49:17 2013 (r258544) @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include "opt_hwpmc_hooks.h" #include "opt_isa.h" #include "opt_kdb.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/bus.h> Modified: projects/random_number_generator/sys/amd64/linux32/linux32_dummy.c ============================================================================== --- projects/random_number_generator/sys/amd64/linux32/linux32_dummy.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/amd64/linux32/linux32_dummy.c Mon Nov 25 10:49:17 2013 (r258544) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/kernel.h> Modified: projects/random_number_generator/sys/arm/include/machdep.h ============================================================================== --- projects/random_number_generator/sys/arm/include/machdep.h Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/arm/include/machdep.h Mon Nov 25 10:49:17 2013 (r258544) @@ -41,10 +41,10 @@ vm_offset_t parse_boot_param(struct arm_ * - initarm_early_init() is called very early, after parsing the boot params * and after physical memory has been located and sized. * - * - platform_devmap_init() is called as one of the last steps of early virtual + * - initarm_devmap_init() is called as one of the last steps of early virtual * memory initialization, shortly before the new page tables are installed. * - * - initarm_lastaddr() is called after platform_devmap_init(), and must return + * - initarm_lastaddr() is called after initarm_devmap_init(), and must return * the address of the first byte of unusable KVA space. This allows a * platform to carve out of the top of the KVA space whatever reserves it * needs for things like static device mapping, and this is called to get the Modified: projects/random_number_generator/sys/arm/mv/mv_machdep.c ============================================================================== --- projects/random_number_generator/sys/arm/mv/mv_machdep.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/arm/mv/mv_machdep.c Mon Nov 25 10:49:17 2013 (r258544) @@ -296,7 +296,7 @@ out: * Supply a default do-nothing implementation of fdt_pci_devmap() via a weak * alias. Many Marvell platforms don't support a PCI interface, but to support * those that do, we end up with a reference to this function below, in - * platform_devmap_init(). If "device pci" appears in the kernel config, the + * initarm_devmap_init(). If "device pci" appears in the kernel config, the * real implementation of this function in dev/fdt/fdt_pci.c overrides the weak * alias defined here. */ Modified: projects/random_number_generator/sys/arm/s3c2xx0/s3c24x0_machdep.c ============================================================================== --- projects/random_number_generator/sys/arm/s3c2xx0/s3c24x0_machdep.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/arm/s3c2xx0/s3c24x0_machdep.c Mon Nov 25 10:49:17 2013 (r258544) @@ -351,7 +351,7 @@ initarm(struct arm_boot_params *abp) * but since we are boot strapping the addresses used for the read * may have just been remapped and thus the cache could be out * of sync. A re-clean after the switch will cure this. - * After booting there are no gross reloations of the kernel thus + * After booting there are no gross relocations of the kernel thus * this problem will not occur after initarm(). */ cpu_idcache_wbinv_all(); Modified: projects/random_number_generator/sys/boot/arm/uboot/start.S ============================================================================== --- projects/random_number_generator/sys/boot/arm/uboot/start.S Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/boot/arm/uboot/start.S Mon Nov 25 10:49:17 2013 (r258544) @@ -39,9 +39,10 @@ _start: ldr ip, =uboot_address str sp, [ip] - /* Save U-Boot's r8 */ + /* Save U-Boot's r8 and r9 */ ldr ip, =saved_regs str r8, [ip, #0] + str r9, [ip, #4] #ifdef _ARM_ARCH_6 mrc p15, 0, r2, c1, c0, 0 @@ -57,21 +58,24 @@ _start: * syscall() */ ENTRY(syscall) - /* Save caller's lr and r8 */ + /* Save caller's lr, r8 and r9 */ ldr ip, =saved_regs - str lr, [ip, #4] str r8, [ip, #8] - /* Restore U-Boot's r8 */ + str r9, [ip, #12] + str lr, [ip, #16] + /* Restore U-Boot's r8 and r9 */ ldr r8, [ip, #0] + ldr r9, [ip, #4] /* Call into U-Boot */ ldr lr, =return_from_syscall ldr ip, =syscall_ptr ldr pc, [ip] return_from_syscall: - /* Restore loader's r8 and lr */ + /* Restore loader's r8, r9 and lr */ ldr ip, =saved_regs + ldr lr, [ip, #16] + ldr r9, [ip, #12] ldr r8, [ip, #8] - ldr lr, [ip, #4] /* Return to caller */ mov pc, lr @@ -90,5 +94,7 @@ uboot_address: saved_regs: .long 0 /* U-Boot's r8 */ + .long 0 /* U-Boot's r9 */ .long 0 /* Loader's r8 */ + .long 0 /* Loader's r9 */ .long 0 /* Loader's lr */ Modified: projects/random_number_generator/sys/cam/ctl/ctl_backend_block.c ============================================================================== --- projects/random_number_generator/sys/cam/ctl/ctl_backend_block.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/cam/ctl/ctl_backend_block.c Mon Nov 25 10:49:17 2013 (r258544) @@ -42,8 +42,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <opt_kdtrace.h> - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> Modified: projects/random_number_generator/sys/cddl/dev/dtrace/dtrace_test.c ============================================================================== --- projects/random_number_generator/sys/cddl/dev/dtrace/dtrace_test.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/cddl/dev/dtrace/dtrace_test.c Mon Nov 25 10:49:17 2013 (r258544) @@ -25,8 +25,6 @@ * $FreeBSD$ * */ -#include "opt_kdtrace.h" - #include <sys/cdefs.h> #include <sys/types.h> #include <sys/param.h> Modified: projects/random_number_generator/sys/cddl/dev/lockstat/lockstat.c ============================================================================== --- projects/random_number_generator/sys/cddl/dev/lockstat/lockstat.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/cddl/dev/lockstat/lockstat.c Mon Nov 25 10:49:17 2013 (r258544) @@ -29,8 +29,6 @@ * Use is subject to license terms. */ -#include "opt_kdtrace.h" - #include <sys/cdefs.h> #include <sys/param.h> #include <sys/systm.h> Modified: projects/random_number_generator/sys/cddl/dev/sdt/sdt.c ============================================================================== --- projects/random_number_generator/sys/cddl/dev/sdt/sdt.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/cddl/dev/sdt/sdt.c Mon Nov 25 10:49:17 2013 (r258544) @@ -39,8 +39,6 @@ * unloaded; in particular, probes may not span multiple kernel modules. */ -#include "opt_kdtrace.h" - #include <sys/cdefs.h> #include <sys/param.h> #include <sys/systm.h> Modified: projects/random_number_generator/sys/compat/linux/linux_emul.c ============================================================================== --- projects/random_number_generator/sys/compat/linux/linux_emul.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/compat/linux/linux_emul.c Mon Nov 25 10:49:17 2013 (r258544) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/systm.h> Modified: projects/random_number_generator/sys/compat/linux/linux_fork.c ============================================================================== --- projects/random_number_generator/sys/compat/linux/linux_fork.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/compat/linux/linux_fork.c Mon Nov 25 10:49:17 2013 (r258544) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/systm.h> Modified: projects/random_number_generator/sys/compat/linux/linux_futex.c ============================================================================== --- projects/random_number_generator/sys/compat/linux/linux_futex.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/compat/linux/linux_futex.c Mon Nov 25 10:49:17 2013 (r258544) @@ -38,7 +38,6 @@ __KERNEL_RCSID(1, "$NetBSD: linux_futex. #endif #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/systm.h> Modified: projects/random_number_generator/sys/compat/linux/linux_mib.c ============================================================================== --- projects/random_number_generator/sys/compat/linux/linux_mib.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/compat/linux/linux_mib.c Mon Nov 25 10:49:17 2013 (r258544) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/kernel.h> Modified: projects/random_number_generator/sys/compat/linux/linux_misc.c ============================================================================== --- projects/random_number_generator/sys/compat/linux/linux_misc.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/compat/linux/linux_misc.c Mon Nov 25 10:49:17 2013 (r258544) @@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/blist.h> Modified: projects/random_number_generator/sys/compat/linux/linux_sysctl.c ============================================================================== --- projects/random_number_generator/sys/compat/linux/linux_sysctl.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/compat/linux/linux_sysctl.c Mon Nov 25 10:49:17 2013 (r258544) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/kernel.h> Modified: projects/random_number_generator/sys/compat/linux/linux_time.c ============================================================================== --- projects/random_number_generator/sys/compat/linux/linux_time.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/compat/linux/linux_time.c Mon Nov 25 10:49:17 2013 (r258544) @@ -36,7 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_time.c #endif #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/kernel.h> Modified: projects/random_number_generator/sys/compat/linux/linux_uid16.c ============================================================================== --- projects/random_number_generator/sys/compat/linux/linux_uid16.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/compat/linux/linux_uid16.c Mon Nov 25 10:49:17 2013 (r258544) @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/fcntl.h> #include <sys/param.h> Modified: projects/random_number_generator/sys/compat/linux/linux_util.c ============================================================================== --- projects/random_number_generator/sys/compat/linux/linux_util.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/compat/linux/linux_util.c Mon Nov 25 10:49:17 2013 (r258544) @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/bus.h> Modified: projects/random_number_generator/sys/conf/options ============================================================================== --- projects/random_number_generator/sys/conf/options Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/conf/options Mon Nov 25 10:49:17 2013 (r258544) @@ -126,7 +126,7 @@ GEOM_UZIP opt_geom.h GEOM_VIRSTOR opt_geom.h GEOM_VOL opt_geom.h GEOM_ZERO opt_geom.h -KDTRACE_HOOKS opt_kdtrace.h +KDTRACE_HOOKS opt_global.h KSTACK_MAX_PAGES KSTACK_PAGES KTRACE Modified: projects/random_number_generator/sys/dev/sfxge/common/efsys.h ============================================================================== --- projects/random_number_generator/sys/dev/sfxge/common/efsys.h Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/dev/sfxge/common/efsys.h Mon Nov 25 10:49:17 2013 (r258544) @@ -270,7 +270,7 @@ typedef struct __efsys_identifier_s efsy /* PROBE */ -#ifndef KDTRACE_HOOKS +#ifndef DTRACE_PROBE #define EFSYS_PROBE(_name) @@ -295,7 +295,7 @@ typedef struct __efsys_identifier_s efsy _type3, _arg3, _type4, _arg4, _type5, _arg5, \ _type6, _arg6, _type7, _arg7) -#else /* KDTRACE_HOOKS */ +#else /* DTRACE_PROBE */ #define EFSYS_PROBE(_name) \ DTRACE_PROBE(_name) @@ -359,7 +359,7 @@ typedef struct __efsys_identifier_s efsy _type6, _arg6) #endif -#endif /* KDTRACE_HOOKS */ +#endif /* DTRACE_PROBE */ /* DMA */ Modified: projects/random_number_generator/sys/dev/xen/blkback/blkback.c ============================================================================== --- projects/random_number_generator/sys/dev/xen/blkback/blkback.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/dev/xen/blkback/blkback.c Mon Nov 25 10:49:17 2013 (r258544) @@ -40,8 +40,6 @@ __FBSDID("$FreeBSD$"); * a FreeBSD domain to other domains. */ -#include "opt_kdtrace.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> Modified: projects/random_number_generator/sys/fs/nfs/nfs_commonkrpc.c ============================================================================== --- projects/random_number_generator/sys/fs/nfs/nfs_commonkrpc.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/fs/nfs/nfs_commonkrpc.c Mon Nov 25 10:49:17 2013 (r258544) @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); * Socket operations for use by nfs */ -#include "opt_kdtrace.h" #include "opt_kgssapi.h" #include "opt_nfs.h" Modified: projects/random_number_generator/sys/fs/nfsclient/nfs_clbio.c ============================================================================== --- projects/random_number_generator/sys/fs/nfsclient/nfs_clbio.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/fs/nfsclient/nfs_clbio.c Mon Nov 25 10:49:17 2013 (r258544) @@ -35,8 +35,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/bio.h> Modified: projects/random_number_generator/sys/fs/nfsclient/nfs_clnode.c ============================================================================== --- projects/random_number_generator/sys/fs/nfsclient/nfs_clnode.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/fs/nfsclient/nfs_clnode.c Mon Nov 25 10:49:17 2013 (r258544) @@ -35,8 +35,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/fcntl.h> Modified: projects/random_number_generator/sys/fs/nfsclient/nfs_clport.c ============================================================================== --- projects/random_number_generator/sys/fs/nfsclient/nfs_clport.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/fs/nfsclient/nfs_clport.c Mon Nov 25 10:49:17 2013 (r258544) @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet6.h" -#include "opt_kdtrace.h" #include <sys/capability.h> Modified: projects/random_number_generator/sys/fs/nfsclient/nfs_clsubs.c ============================================================================== --- projects/random_number_generator/sys/fs/nfsclient/nfs_clsubs.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/fs/nfsclient/nfs_clsubs.c Mon Nov 25 10:49:17 2013 (r258544) @@ -35,8 +35,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" - /* * These functions support the macros and help fiddle mbuf chains for * the nfs op functions. They do things like create the rpc header and Modified: projects/random_number_generator/sys/fs/nfsclient/nfs_clvnops.c ============================================================================== --- projects/random_number_generator/sys/fs/nfsclient/nfs_clvnops.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/fs/nfsclient/nfs_clvnops.c Mon Nov 25 10:49:17 2013 (r258544) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); * vnode op calls for Sun NFS version 2, 3 and 4 */ -#include "opt_kdtrace.h" #include "opt_inet.h" #include <sys/param.h> Modified: projects/random_number_generator/sys/i386/i386/exception.s ============================================================================== --- projects/random_number_generator/sys/i386/i386/exception.s Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/i386/i386/exception.s Mon Nov 25 10:49:17 2013 (r258544) @@ -37,7 +37,6 @@ #include "opt_apic.h" #include "opt_atpic.h" #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include "opt_npx.h" #include <machine/asmacros.h> Modified: projects/random_number_generator/sys/i386/i386/machdep.c ============================================================================== --- projects/random_number_generator/sys/i386/i386/machdep.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/i386/i386/machdep.c Mon Nov 25 10:49:17 2013 (r258544) @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include "opt_perfmon.h" #include "opt_platform.h" #include "opt_xbox.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/proc.h> Modified: projects/random_number_generator/sys/i386/i386/trap.c ============================================================================== --- projects/random_number_generator/sys/i386/i386/trap.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/i386/i386/trap.c Mon Nov 25 10:49:17 2013 (r258544) @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include "opt_hwpmc_hooks.h" #include "opt_isa.h" #include "opt_kdb.h" -#include "opt_kdtrace.h" #include "opt_npx.h" #include "opt_trap.h" Modified: projects/random_number_generator/sys/i386/linux/linux_dummy.c ============================================================================== --- projects/random_number_generator/sys/i386/linux/linux_dummy.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/i386/linux/linux_dummy.c Mon Nov 25 10:49:17 2013 (r258544) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/kernel.h> Modified: projects/random_number_generator/sys/kern/kern_clock.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_clock.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_clock.c Mon Nov 25 10:49:17 2013 (r258544) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_kdb.h" #include "opt_device_polling.h" #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include "opt_ntp.h" #include "opt_watchdog.h" Modified: projects/random_number_generator/sys/kern/kern_clocksource.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_clocksource.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_clocksource.c Mon Nov 25 10:49:17 2013 (r258544) @@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$"); */ #include "opt_device_polling.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/systm.h> Modified: projects/random_number_generator/sys/kern/kern_exec.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_exec.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_exec.c Mon Nov 25 10:49:17 2013 (r258544) @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include "opt_capsicum.h" #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_vm.h" Modified: projects/random_number_generator/sys/kern/kern_exit.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_exit.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_exit.c Mon Nov 25 10:49:17 2013 (r258544) @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_procdesc.h" Modified: projects/random_number_generator/sys/kern/kern_fork.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_fork.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_fork.c Mon Nov 25 10:49:17 2013 (r258544) @@ -37,7 +37,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_kstack_pages.h" #include "opt_procdesc.h" Modified: projects/random_number_generator/sys/kern/kern_lock.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_lock.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_lock.c Mon Nov 25 10:49:17 2013 (r258544) @@ -29,7 +29,6 @@ #include "opt_adaptive_lockmgrs.h" #include "opt_ddb.h" #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); Modified: projects/random_number_generator/sys/kern/kern_lockstat.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_lockstat.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_lockstat.c Mon Nov 25 10:49:17 2013 (r258544) @@ -32,8 +32,6 @@ * */ -#include "opt_kdtrace.h" - #ifdef KDTRACE_HOOKS #include <sys/time.h> Modified: projects/random_number_generator/sys/kern/kern_malloc.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_malloc.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_malloc.c Mon Nov 25 10:49:17 2013 (r258544) @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" -#include "opt_kdtrace.h" #include "opt_vm.h" #include <sys/param.h> Modified: projects/random_number_generator/sys/kern/kern_mutex.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_mutex.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_mutex.c Mon Nov 25 10:49:17 2013 (r258544) @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_global.h" #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include "opt_sched.h" #include <sys/param.h> @@ -249,8 +248,6 @@ __mtx_unlock_flags(volatile uintptr_t *c line); mtx_assert(m, MA_OWNED); - if (m->mtx_recurse == 0) - LOCKSTAT_PROFILE_RELEASE_LOCK(LS_MTX_UNLOCK_RELEASE, m); __mtx_unlock(m, curthread, opts, file, line); curthread->td_locks--; } Modified: projects/random_number_generator/sys/kern/kern_priv.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_priv.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_priv.c Mon Nov 25 10:49:17 2013 (r258544) @@ -28,8 +28,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_kdtrace.h" - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); Modified: projects/random_number_generator/sys/kern/kern_proc.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_proc.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_proc.c Mon Nov 25 10:49:17 2013 (r258544) @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include "opt_ddb.h" -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_kstack_pages.h" #include "opt_stack.h" Modified: projects/random_number_generator/sys/kern/kern_racct.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_racct.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_racct.c Mon Nov 25 10:49:17 2013 (r258544) @@ -32,7 +32,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_sched.h" #include <sys/param.h> Modified: projects/random_number_generator/sys/kern/kern_rmlock.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_rmlock.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_rmlock.c Mon Nov 25 10:49:17 2013 (r258544) @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/systm.h> Modified: projects/random_number_generator/sys/kern/kern_rwlock.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_rwlock.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_rwlock.c Mon Nov 25 10:49:17 2013 (r258544) @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include "opt_no_adaptive_rwlocks.h" #include <sys/param.h> @@ -322,8 +321,6 @@ _rw_wunlock_cookie(volatile uintptr_t *c WITNESS_UNLOCK(&rw->lock_object, LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("WUNLOCK", &rw->lock_object, 0, rw->rw_recurse, file, line); - if (!rw_recursed(rw)) - LOCKSTAT_PROFILE_RELEASE_LOCK(LS_RW_WUNLOCK_RELEASE, rw); __rw_wunlock(rw, curthread, file, line); curthread->td_locks--; } Modified: projects/random_number_generator/sys/kern/kern_sdt.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_sdt.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_sdt.c Mon Nov 25 10:49:17 2013 (r258544) @@ -25,8 +25,6 @@ * $FreeBSD$ */ -#include "opt_kdtrace.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/sdt.h> Modified: projects/random_number_generator/sys/kern/kern_sig.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_sig.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_sig.c Mon Nov 25 10:49:17 2013 (r258544) @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_core.h" #include "opt_procdesc.h" Modified: projects/random_number_generator/sys/kern/kern_sx.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_sx.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_sx.c Mon Nov 25 10:49:17 2013 (r258544) @@ -38,7 +38,6 @@ #include "opt_ddb.h" #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include "opt_no_adaptive_sx.h" #include <sys/cdefs.h> @@ -109,7 +108,6 @@ PMC_SOFT_DECLARE( , , lock, failed); * Returns true if an exclusive lock is recursed. It assumes * curthread currently has an exclusive lock. */ -#define sx_recurse lock_object.lo_data #define sx_recursed(sx) ((sx)->sx_recurse != 0) static void assert_sx(const struct lock_object *lock, int what); @@ -365,7 +363,6 @@ _sx_sunlock(struct sx *sx, const char *f WITNESS_UNLOCK(&sx->lock_object, 0, file, line); LOCK_LOG_LOCK("SUNLOCK", &sx->lock_object, 0, 0, file, line); __sx_sunlock(sx, file, line); - LOCKSTAT_PROFILE_RELEASE_LOCK(LS_SX_SUNLOCK_RELEASE, sx); curthread->td_locks--; } @@ -381,8 +378,6 @@ _sx_xunlock(struct sx *sx, const char *f WITNESS_UNLOCK(&sx->lock_object, LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("XUNLOCK", &sx->lock_object, 0, sx->sx_recurse, file, line); - if (!sx_recursed(sx)) - LOCKSTAT_PROFILE_RELEASE_LOCK(LS_SX_XUNLOCK_RELEASE, sx); __sx_xunlock(sx, curthread, file, line); curthread->td_locks--; } Modified: projects/random_number_generator/sys/kern/kern_synch.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_synch.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_synch.c Mon Nov 25 10:49:17 2013 (r258544) @@ -37,7 +37,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_sched.h" Modified: projects/random_number_generator/sys/kern/kern_thread.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_thread.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_thread.c Mon Nov 25 10:49:17 2013 (r258544) @@ -27,7 +27,6 @@ */ #include "opt_witness.h" -#include "opt_kdtrace.h" #include "opt_hwpmc_hooks.h" #include <sys/cdefs.h> Modified: projects/random_number_generator/sys/kern/kern_timeout.c ============================================================================== --- projects/random_number_generator/sys/kern/kern_timeout.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/kern_timeout.c Mon Nov 25 10:49:17 2013 (r258544) @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_callout_profiling.h" -#include "opt_kdtrace.h" #if defined(__arm__) #include "opt_timer.h" #endif Modified: projects/random_number_generator/sys/kern/sched_4bsd.c ============================================================================== --- projects/random_number_generator/sys/kern/sched_4bsd.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/sched_4bsd.c Mon Nov 25 10:49:17 2013 (r258544) @@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$"); #include "opt_hwpmc_hooks.h" #include "opt_sched.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/systm.h> Modified: projects/random_number_generator/sys/kern/sched_ule.c ============================================================================== --- projects/random_number_generator/sys/kern/sched_ule.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/sched_ule.c Mon Nov 25 10:49:17 2013 (r258544) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "opt_hwpmc_hooks.h" -#include "opt_kdtrace.h" #include "opt_sched.h" #include <sys/param.h> Modified: projects/random_number_generator/sys/kern/subr_devstat.c ============================================================================== --- projects/random_number_generator/sys/kern/subr_devstat.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/subr_devstat.c Mon Nov 25 10:49:17 2013 (r258544) @@ -29,8 +29,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" - #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> Modified: projects/random_number_generator/sys/kern/subr_sleepqueue.c ============================================================================== --- projects/random_number_generator/sys/kern/subr_sleepqueue.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/subr_sleepqueue.c Mon Nov 25 10:49:17 2013 (r258544) @@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$"); #include "opt_sleepqueue_profiling.h" #include "opt_ddb.h" -#include "opt_kdtrace.h" #include "opt_sched.h" #include <sys/param.h> Modified: projects/random_number_generator/sys/kern/subr_syscall.c ============================================================================== --- projects/random_number_generator/sys/kern/subr_syscall.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/subr_syscall.c Mon Nov 25 10:49:17 2013 (r258544) @@ -40,7 +40,6 @@ #include "opt_capsicum.h" #include "opt_ktrace.h" -#include "opt_kdtrace.h" __FBSDID("$FreeBSD$"); Modified: projects/random_number_generator/sys/kern/subr_trap.c ============================================================================== --- projects/random_number_generator/sys/kern/subr_trap.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/subr_trap.c Mon Nov 25 10:49:17 2013 (r258544) @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include "opt_hwpmc_hooks.h" #include "opt_ktrace.h" -#include "opt_kdtrace.h" #include "opt_sched.h" #include <sys/param.h> Modified: projects/random_number_generator/sys/kern/subr_turnstile.c ============================================================================== --- projects/random_number_generator/sys/kern/subr_turnstile.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/subr_turnstile.c Mon Nov 25 10:49:17 2013 (r258544) @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" -#include "opt_kdtrace.h" #include "opt_turnstile_profiling.h" #include "opt_sched.h" Modified: projects/random_number_generator/sys/kern/vfs_cache.c ============================================================================== --- projects/random_number_generator/sys/kern/vfs_cache.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/vfs_cache.c Mon Nov 25 10:49:17 2013 (r258544) @@ -35,7 +35,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include <sys/param.h> Modified: projects/random_number_generator/sys/kern/vfs_lookup.c ============================================================================== --- projects/random_number_generator/sys/kern/vfs_lookup.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/vfs_lookup.c Mon Nov 25 10:49:17 2013 (r258544) @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include "opt_capsicum.h" -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include <sys/param.h> Modified: projects/random_number_generator/sys/kern/vfs_syscalls.c ============================================================================== --- projects/random_number_generator/sys/kern/vfs_syscalls.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/kern/vfs_syscalls.c Mon Nov 25 10:49:17 2013 (r258544) @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "opt_capsicum.h" #include "opt_compat.h" -#include "opt_kdtrace.h" #include "opt_ktrace.h" #include <sys/param.h> Modified: projects/random_number_generator/sys/mips/mips/exception.S ============================================================================== --- projects/random_number_generator/sys/mips/mips/exception.S Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/mips/mips/exception.S Mon Nov 25 10:49:17 2013 (r258544) @@ -55,7 +55,7 @@ */ #include "opt_ddb.h" -#include "opt_kdtrace.h" + #include <machine/asm.h> #include <machine/cpu.h> #include <machine/regnum.h> Modified: projects/random_number_generator/sys/mips/mips/trap.c ============================================================================== --- projects/random_number_generator/sys/mips/mips/trap.c Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/mips/mips/trap.c Mon Nov 25 10:49:17 2013 (r258544) @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include "opt_ddb.h" #include "opt_global.h" #include "opt_ktrace.h" -#include "opt_kdtrace.h" #include <sys/param.h> #include <sys/systm.h> Modified: projects/random_number_generator/sys/modules/crypto/Makefile ============================================================================== --- projects/random_number_generator/sys/modules/crypto/Makefile Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/modules/crypto/Makefile Mon Nov 25 10:49:17 2013 (r258544) @@ -16,6 +16,6 @@ SRCS += skipjack.c bf_enc.c bf_ecb.c bf_ SRCS += des_ecb.c des_enc.c des_setkey.c SRCS += sha1.c sha2.c SRCS += opt_param.h cryptodev_if.h bus_if.h device_if.h -SRCS += opt_ddb.h opt_kdtrace.h +SRCS += opt_ddb.h SRCS += camellia.c camellia-api.c .include <bsd.kmod.mk> Modified: projects/random_number_generator/sys/modules/ctl/Makefile ============================================================================== --- projects/random_number_generator/sys/modules/ctl/Makefile Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/modules/ctl/Makefile Mon Nov 25 10:49:17 2013 (r258544) @@ -22,7 +22,6 @@ SRCS+= bus_if.h SRCS+= device_if.h SRCS+= vnode_if.h SRCS+= opt_cam.h -SRCS+= opt_kdtrace.h #CFLAGS+=-DICL_KERNEL_PROXY Modified: projects/random_number_generator/sys/modules/dtrace/dtrace_test/Makefile ============================================================================== --- projects/random_number_generator/sys/modules/dtrace/dtrace_test/Makefile Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/modules/dtrace/dtrace_test/Makefile Mon Nov 25 10:49:17 2013 (r258544) @@ -5,7 +5,6 @@ KMOD= dtrace_test SRCS= dtrace_test.c -SRCS+= opt_kdtrace.h SRCS+= vnode_if.h CFLAGS+= -I${.CURDIR}/../../.. Modified: projects/random_number_generator/sys/modules/dtrace/lockstat/Makefile ============================================================================== --- projects/random_number_generator/sys/modules/dtrace/lockstat/Makefile Mon Nov 25 08:27:23 2013 (r258543) +++ projects/random_number_generator/sys/modules/dtrace/lockstat/Makefile Mon Nov 25 10:49:17 2013 (r258544) @@ -5,7 +5,7 @@ KMOD= lockstat *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311251049.rAPAnIKq096775>