From 6aa3ce3bfe3aa9ad05eb0a421c8761bdba40b4c1 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sun, 11 Oct 2009 14:18:03 +0000 Subject: 2009-10-11 Joel Sherrill * score/inline/rtems/score/thread.inl, score/src/threaddispatch.c: Correct conditionals so _Thread_Enable_dispatch() is always inlined when intended. --- cpukit/ChangeLog | 6 ++++++ cpukit/score/inline/rtems/score/thread.inl | 3 ++- cpukit/score/src/threaddispatch.c | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'cpukit') diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 724bf13de3..3d7d207a57 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,9 @@ +2009-10-11 Joel Sherrill + + * score/inline/rtems/score/thread.inl, score/src/threaddispatch.c: + Correct conditionals so _Thread_Enable_dispatch() is always inlined + when intended. + 2009-10-10 Joel Sherrill * posix/include/rtems/posix/threadsup.h, posix/src/cancel.c, diff --git a/cpukit/score/inline/rtems/score/thread.inl b/cpukit/score/inline/rtems/score/thread.inl index f268817971..944aa9502d 100644 --- a/cpukit/score/inline/rtems/score/thread.inl +++ b/cpukit/score/inline/rtems/score/thread.inl @@ -220,7 +220,8 @@ RTEMS_INLINE_ROUTINE void _Thread_Disable_dispatch( void ) * processor will be transferred to the heir thread. */ -#if ( (CPU_INLINE_ENABLE_DISPATCH == FALSE) || \ +#if ( (defined(CPU_INLINE_ENABLE_DISPATCH) && \ + (CPU_INLINE_ENABLE_DISPATCH == FALSE)) || \ (__RTEMS_DO_NOT_INLINE_THREAD_ENABLE_DISPATCH__ == 1) ) void _Thread_Enable_dispatch( void ); #else diff --git a/cpukit/score/src/threaddispatch.c b/cpukit/score/src/threaddispatch.c index 501db3a57e..e3c0ded97d 100644 --- a/cpukit/score/src/threaddispatch.c +++ b/cpukit/score/src/threaddispatch.c @@ -50,7 +50,8 @@ * no dispatch thread */ -#if ( (CPU_INLINE_ENABLE_DISPATCH == FALSE) || \ +#if ( (defined(CPU_INLINE_ENABLE_DISPATCH) && \ + (CPU_INLINE_ENABLE_DISPATCH == FALSE)) || \ (__RTEMS_DO_NOT_INLINE_THREAD_ENABLE_DISPATCH__ == 1) ) void _Thread_Enable_dispatch( void ) { -- cgit v1.2.3