---
freebsd/sys/contrib/altq/altq/altq_subr.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/freebsd/sys/contrib/altq/altq/altq_subr.c
b/freebsd/sys/contrib/altq/altq/altq_subr.c
index 3ebd58d..cfa5c7e 100644
--- a/freebsd/sys/contrib/altq/altq/altq_subr.c
+++ b/freebsd/sys/contrib/altq/altq/altq_subr.c
@@ -292,7 +292,7 @@ altq_disable(ifq)
ASSERT(ifq->ifq_len == 0);
ifq->altq_flags &= ~(ALTQF_ENABLED|ALTQF_CLASSIFY);
splx(s);
-
+
IFQ_UNLOCK(ifq);
return 0;
}
@@ -379,7 +379,7 @@ tbr_set(ifq, profile)
struct tb_profile *profile;
{
struct tb_regulator *tbr, *otbr;
-
+
if (tbr_dequeue_ptr == NULL)
tbr_dequeue_ptr = tbr_dequeue;
@@ -930,6 +930,7 @@ init_machclk_setup(void)
#if defined(__NetBSD__) && defined(MULTIPROCESSOR)
machclk_usepcc = 0;
#endif
+#if !defined(__rtems__)
#if defined(__amd64__) || defined(__i386__)
/* check if TSC is available */
#ifdef __FreeBSD__
@@ -938,6 +939,7 @@ init_machclk_setup(void)
#else
if ((cpu_feature & CPUID_TSC) == 0)
#endif
+#endif /* __rtems__ */
machclk_usepcc = 0;
#endif
}
@@ -968,6 +970,7 @@ init_machclk(void)
* accessible, just use it.
*/
#if defined(__amd64__) || defined(__i386__)
+#ifndef __rtems__
#ifdef __FreeBSD__
machclk_freq = atomic_load_acq_64(&tsc_freq);
#elif defined(__NetBSD__)
@@ -975,6 +978,7 @@ init_machclk(void)
#elif defined(__OpenBSD__) && (defined(I586_CPU) || defined(I686_CPU))
machclk_freq = pentium_mhz * 1000000;
#endif
+#endif /* __rtems */
#endif
/*
--
2.2.2
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
