summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2011-10-19 07:25:10 +0000
committerSebastian Huber <sebastian.huber@embedded-brains.de>2011-10-19 07:25:10 +0000
commit9e162be9194d52fafc11329ef84db422e88440a5 (patch)
tree83f47f0a02c0f222f782faeaba8fe2cdcdf2f6f6 /cpukit
parent2011-10-18 Jennifer Averett <Jennifer.Averett@OARcorp.com> (diff)
downloadrtems-9e162be9194d52fafc11329ef84db422e88440a5.tar.bz2
2011-10-18 Sebastian Huber <sebastian.huber@embedded-brains.de>
PR 1939/cpukit * rtems/src/ratemonperiod.c: Fixed type mismatch.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog5
-rw-r--r--cpukit/rtems/src/ratemonperiod.c7
2 files changed, 8 insertions, 4 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 8caedf3051..4903f2a6ce 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-18 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ PR 1939/cpukit
+ * rtems/src/ratemonperiod.c: Fixed type mismatch.
+
2011-10-18 Ralf Corsépius <ralf.corsepius@rtems.org>
* libcsupport/include/rtems/libio.h, libcsupport/src/termios.c:
diff --git a/cpukit/rtems/src/ratemonperiod.c b/cpukit/rtems/src/ratemonperiod.c
index 4af3f90b5b..28a83d72a1 100644
--- a/cpukit/rtems/src/ratemonperiod.c
+++ b/cpukit/rtems/src/ratemonperiod.c
@@ -129,18 +129,17 @@ void _Rate_monotonic_Initiate_statistics(
*/
#ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
if (owning_thread == _Thread_Executing) {
-
- rtems_thread_cpu_usage_t ran;
+ Timestamp_Control ran;
/*
* Adjust the CPU time used to account for the time since last
* context switch.
*/
- _Timespec_Subtract(
+ _Timestamp_Subtract(
&_Thread_Time_of_last_context_switch, &uptime, &ran
);
- _Timespec_Add_to( &the_period->cpu_usage_period_initiated, &ran );
+ _Timestamp_Add_to( &the_period->cpu_usage_period_initiated, &ran );
}
#endif