diff options
author | Juli Mallett <jmallett@FreeBSD.org> | 2012-11-24 02:55:05 +0000 |
---|---|---|
committer | Juli Mallett <jmallett@FreeBSD.org> | 2012-11-24 02:55:05 +0000 |
commit | ea716a4f2476a948fec854bbd90f221aec2adb2e (patch) | |
tree | 0efe51cb9997033ac188ca7032b8a0f8b249cdbc /sys/contrib/octeon-sdk | |
parent | 6dd853a77aeecb7f2b28281add7b252ad7df0690 (diff) | |
download | src-ea716a4f2476a948fec854bbd90f221aec2adb2e.tar.gz src-ea716a4f2476a948fec854bbd90f221aec2adb2e.zip |
o) Have the FreeBSD kernel option "INVARIANTS" trickle down into the Simple
Executive code where similar invariant knobs exist.
o) Make the Simple Executive's warning function print "WARNING: " on the same
line as the warning it is displaying, rather than on a separate line.
Notes
Notes:
svn path=/head/; revision=243473
Diffstat (limited to 'sys/contrib/octeon-sdk')
-rw-r--r-- | sys/contrib/octeon-sdk/cvmx-pow.h | 20 | ||||
-rw-r--r-- | sys/contrib/octeon-sdk/cvmx-warn.c | 4 | ||||
-rw-r--r-- | sys/contrib/octeon-sdk/cvmx.h | 19 |
3 files changed, 38 insertions, 5 deletions
diff --git a/sys/contrib/octeon-sdk/cvmx-pow.h b/sys/contrib/octeon-sdk/cvmx-pow.h index a5771c6dcfc0..f70eaf6542cc 100644 --- a/sys/contrib/octeon-sdk/cvmx-pow.h +++ b/sys/contrib/octeon-sdk/cvmx-pow.h @@ -80,9 +80,23 @@ extern "C" { #endif -/* Default to having all POW constancy checks turned on */ -#ifndef CVMX_ENABLE_POW_CHECKS -#define CVMX_ENABLE_POW_CHECKS 1 +#if defined(__FreeBSD__) && defined(_KERNEL) + /* + * For the FreeBSD kernel, have POW consistency checks depend on + * the setting of INVARIANTS. + */ + #ifndef CVMX_ENABLE_POW_CHECKS + #ifdef INVARIANTS + #define CVMX_ENABLE_POW_CHECKS 1 + #else + #define CVMX_ENABLE_POW_CHECKS 0 + #endif + #endif +#else + /* Default to having all POW constancy checks turned on */ + #ifndef CVMX_ENABLE_POW_CHECKS + #define CVMX_ENABLE_POW_CHECKS 1 + #endif #endif /** diff --git a/sys/contrib/octeon-sdk/cvmx-warn.c b/sys/contrib/octeon-sdk/cvmx-warn.c index 4f1464a94d4a..7b0b3fdf7663 100644 --- a/sys/contrib/octeon-sdk/cvmx-warn.c +++ b/sys/contrib/octeon-sdk/cvmx-warn.c @@ -77,7 +77,11 @@ void cvmx_warn(const char *format, ...) printk("WARNING:"); vprintk(format, args); #else +#ifdef CVMX_BUILD_FOR_FREEBSD_KERNEL + printf("WARNING: "); +#else printf("WARNING:\n"); +#endif vprintf(format, args); #endif va_end(args); diff --git a/sys/contrib/octeon-sdk/cvmx.h b/sys/contrib/octeon-sdk/cvmx.h index 0b92bc368d1d..3cde2f4e159b 100644 --- a/sys/contrib/octeon-sdk/cvmx.h +++ b/sys/contrib/octeon-sdk/cvmx.h @@ -53,13 +53,28 @@ /* Control whether simple executive applications use 1-1 TLB mappings to access physical ** memory addresses. This must be disabled to allow large programs that use more than ** the 0x10000000 - 0x20000000 virtual address range. +** +** The FreeBSD kernel ifdefs elsewhere should mean that this is never even checked, +** and so does not need to be defined. */ +#if !defined(__FreeBSD__) || !defined(_KERNEL) #ifndef CVMX_USE_1_TO_1_TLB_MAPPINGS #define CVMX_USE_1_TO_1_TLB_MAPPINGS 1 #endif +#endif -#ifndef CVMX_ENABLE_PARAMETER_CHECKING -#define CVMX_ENABLE_PARAMETER_CHECKING 1 +#if defined(__FreeBSD__) && defined(_KERNEL) + #ifndef CVMX_ENABLE_PARAMETER_CHECKING + #ifdef INVARIANTS + #define CVMX_ENABLE_PARAMETER_CHECKING 1 + #else + #define CVMX_ENABLE_PARAMETER_CHECKING 0 + #endif + #endif +#else + #ifndef CVMX_ENABLE_PARAMETER_CHECKING + #define CVMX_ENABLE_PARAMETER_CHECKING 1 + #endif #endif #ifndef CVMX_ENABLE_DEBUG_PRINTS |