diff options
| author | Renato Botelho <renato@netgate.com> | 2016-01-15 08:36:46 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-01-15 08:36:46 -0200 |
| commit | 5118afa75776a41209a94f4a4ddf7c3164fac0df (patch) | |
| tree | a899f605d0f0d9be1fb44d7a8d643a1233065dda /lib | |
| parent | 58b7eab7d39d983cc70f6f1d611f00470a76fca1 (diff) | |
| parent | ce58d6dbf38815b68dedcf0559779e5ceb149a0d (diff) | |
| download | FreeBSD-src-5118afa75776a41209a94f4a4ddf7c3164fac0df.zip FreeBSD-src-5118afa75776a41209a94f4a4ddf7c3164fac0df.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/clang/clang.build.mk | 4 | ||||
| -rw-r--r-- | lib/libpmc/pmc.h | 17 |
2 files changed, 11 insertions, 10 deletions
diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk index e29efc8..7be7efa 100644 --- a/lib/clang/clang.build.mk +++ b/lib/clang/clang.build.mk @@ -27,8 +27,8 @@ TARGET_ABI= gnueabi TARGET_ABI= unknown .endif -TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.2 -BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.2 +TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.3 +BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.3 CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \ -DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \ -DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\" diff --git a/lib/libpmc/pmc.h b/lib/libpmc/pmc.h index e17a584..ed468da 100644 --- a/lib/libpmc/pmc.h +++ b/lib/libpmc/pmc.h @@ -36,14 +36,15 @@ * Driver statistics. */ struct pmc_driverstats { - int pm_intr_ignored; /* #interrupts ignored */ - int pm_intr_processed; /* #interrupts processed */ - int pm_intr_bufferfull; /* #interrupts with ENOSPC */ - int pm_syscalls; /* #syscalls */ - int pm_syscall_errors; /* #syscalls with errors */ - int pm_buffer_requests; /* #buffer requests */ - int pm_buffer_requests_failed; /* #failed buffer requests */ - int pm_log_sweeps; /* #sample buffer processing passes */ + unsigned int pm_intr_ignored; /* #interrupts ignored */ + unsigned int pm_intr_processed; /* #interrupts processed */ + unsigned int pm_intr_bufferfull; /* #interrupts with ENOSPC */ + unsigned int pm_syscalls; /* #syscalls */ + unsigned int pm_syscall_errors; /* #syscalls with errors */ + unsigned int pm_buffer_requests; /* #buffer requests */ + unsigned int pm_buffer_requests_failed; /* #failed buffer requests */ + unsigned int pm_log_sweeps; /* #sample buffer processing + passes */ }; /* |
