From 836f4545dcb75cb399bb498e7a62c20541dac84f Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 7 Jun 2017 08:14:30 +0200 Subject: Fix CPU_COPY() usage The original CPU_COPY() support of Newlib had the parameters in the wrong order. This is fixed in Newlib since 2017-05-22. Update #3023. --- cpukit/score/include/rtems/score/cpusetimpl.h | 2 +- cpukit/score/src/schedulerpriorityaffinitysmp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'cpukit/score') diff --git a/cpukit/score/include/rtems/score/cpusetimpl.h b/cpukit/score/include/rtems/score/cpusetimpl.h index 6a6bf9715e..1cb71d6169 100644 --- a/cpukit/score/include/rtems/score/cpusetimpl.h +++ b/cpukit/score/include/rtems/score/cpusetimpl.h @@ -117,7 +117,7 @@ static inline void _CPU_set_Set( { set->set = &set->preallocated; set->setsize = setsize; - CPU_COPY( set->set, cpuset ); + CPU_COPY( cpuset, set->set ); } /**@}*/ diff --git a/cpukit/score/src/schedulerpriorityaffinitysmp.c b/cpukit/score/src/schedulerpriorityaffinitysmp.c index 8b54295122..45afb571ef 100644 --- a/cpukit/score/src/schedulerpriorityaffinitysmp.c +++ b/cpukit/score/src/schedulerpriorityaffinitysmp.c @@ -624,7 +624,7 @@ bool _Scheduler_priority_affinity_SMP_Get_affinity( return false; } - CPU_COPY( cpuset, node->Affinity.set ); + CPU_COPY( node->Affinity.set, cpuset ); return true; } @@ -660,7 +660,7 @@ bool _Scheduler_priority_affinity_SMP_Set_affinity( _Scheduler_priority_affinity_SMP_Block( scheduler, thread, &node->Base.Base.Base ); } - CPU_COPY( node->Affinity.set, cpuset ); + CPU_COPY( cpuset, node->Affinity.set ); if ( _States_Is_ready( current_state ) ) { /* -- cgit v1.2.3