2 files changed, 15 insertions, 2 deletions
diff --git a/os/kernel/include/chschd.h b/os/kernel/include/chschd.h
index b8406722b..d1b69cad5 100644
--- a/os/kernel/include/chschd.h
+++ b/os/kernel/include/chschd.h
@@ -105,14 +105,27 @@ register Thread *currp asm(CH_CURRP_REGISTER_CACHE);
 extern "C" {
 #endif
   void scheduler_init(void);
+#if !defined(PORT_OPTIMIZED_READYI)
   Thread *chSchReadyI(Thread *tp);
+#endif
+#if !defined(PORT_OPTIMIZED_GOSLEEPS)
   void chSchGoSleepS(tstate_t newstate);
+#endif
+#if !defined(PORT_OPTIMIZED_GOSLEEPTIMEOUTS)
   msg_t chSchGoSleepTimeoutS(tstate_t newstate, systime_t time);
+#endif
+#if !defined(PORT_OPTIMIZED_WAKEUPS)
   void chSchWakeupS(Thread *tp, msg_t msg);
+#endif
+#if !defined(PORT_OPTIMIZED_DORESCHEDULEI)
   void chSchDoRescheduleI(void);
+#endif
+#if !defined(PORT_OPTIMIZED_RESCHEDULES)
   void chSchRescheduleS(void);
+#endif
+#if !defined(PORT_OPTIMIZED_ISRESCHREQUIREDEXI)
   bool_t chSchIsRescRequiredExI(void);
-  void chSchDoYieldS(void);
+#endif
 #ifdef __cplusplus
 }
 #endif
diff --git a/os/kernel/include/chsys.h b/os/kernel/include/chsys.h
index 0a2fa67ad..5c773136f 100644
--- a/os/kernel/include/chsys.h
+++ b/os/kernel/include/chsys.h
@@ -148,7 +148,7 @@
 /**
  * @brief   IRQ handler exit code.
  * @note    Usually IRQ handlers function are also declared naked.
- * @note    This macro usually performs the final reschedulation by using
+ * @note    This macro usually performs the final reschedule by using
  *          @p chSchRescRequiredI() and @p chSchDoRescheduleI().
  */
 #define CH_IRQ_EPILOGUE() PORT_IRQ_EPILOGUE()