summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authorjmallett <jmallett@FreeBSD.org>2012-10-30 06:07:30 +0000
committerjmallett <jmallett@FreeBSD.org>2012-10-30 06:07:30 +0000
commit1729e10b3745cf955dae5a4ecf8a6006294cbe56 (patch)
tree5e335606919c872a2fce8cf9f89b7c5e67545dc0 /sys/contrib
parent21d56b1a98d8e96451b4b76cd5344f263292f35c (diff)
downloadFreeBSD-src-1729e10b3745cf955dae5a4ecf8a6006294cbe56.zip
FreeBSD-src-1729e10b3745cf955dae5a4ecf8a6006294cbe56.tar.gz
Speed feature tests and initialize helper configuration that some CPUs require.
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/octeon-sdk/octeon-feature.c2
-rw-r--r--sys/contrib/octeon-sdk/octeon-feature.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/contrib/octeon-sdk/octeon-feature.c b/sys/contrib/octeon-sdk/octeon-feature.c
index 64bc084..bf18945 100644
--- a/sys/contrib/octeon-sdk/octeon-feature.c
+++ b/sys/contrib/octeon-sdk/octeon-feature.c
@@ -139,7 +139,7 @@ feature_check:
cvmx_dprintf("unknown error %d.\n", val);
break;
}
-#if !defined(CVMX_BUILD_FOR_LINUX_KERNEL) && !defined(__U_BOOT__) && !defined(CVMX_BUILD_FOR_TOOLCHAIN)
+#if !defined(CVMX_BUILD_FOR_LINUX_KERNEL) && !defined(__U_BOOT__) && !defined(CVMX_BUILD_FOR_TOOLCHAIN) && !defined(CVMX_BUILD_FOR_FREEBSD_KERNEL)
exit (1);
#endif
}
diff --git a/sys/contrib/octeon-sdk/octeon-feature.h b/sys/contrib/octeon-sdk/octeon-feature.h
index 7571c33..9814415 100644
--- a/sys/contrib/octeon-sdk/octeon-feature.h
+++ b/sys/contrib/octeon-sdk/octeon-feature.h
@@ -281,7 +281,7 @@ extern uint8_t octeon_feature_map[FEATURE_MAP_SIZE];
#if defined(__U_BOOT__) || defined(CVMX_BUILD_FOR_LINUX_HOST) || defined(CVMX_BUILD_FOR_TOOLCHAIN)
#define octeon_has_feature old_octeon_has_feature
#else
-#if defined(USE_RUNTIME_MODEL_CHECKS)
+#if defined(USE_RUNTIME_MODEL_CHECKS) || (defined(__FreeBSD__) && defined(_KERNEL))
static inline int octeon_has_feature(octeon_feature_t feature)
{
int byte, bit;
OpenPOWER on IntegriCloud