6 files changed, 14 insertions, 46 deletions
diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am
index 4e85062bb8..50d065be7e 100644
--- a/cpukit/sapi/Makefile.am
+++ b/cpukit/sapi/Makefile.am
@@ -34,7 +34,7 @@ libsapi_a_SOURCES = src/extension.c src/extensioncreate.c \
     src/getversionstring.c \
     src/chainappendnotify.c src/chaingetnotify.c src/chaingetwait.c \
     src/chainprependnotify.c src/rbheap.c src/interrtext.c \
-    src/fatal2.c src/fatalsrctext.c
+    src/fatalsrctext.c
 libsapi_a_SOURCES += src/chainprotected.c
 libsapi_a_SOURCES += src/cpucounterconverter.c
 libsapi_a_SOURCES += src/delayticks.c
diff --git a/cpukit/sapi/include/rtems/fatal.h b/cpukit/sapi/include/rtems/fatal.h
index b4b3b0fe6e..03cfafa8d0 100644
--- a/cpukit/sapi/include/rtems/fatal.h
+++ b/cpukit/sapi/include/rtems/fatal.h
@@ -73,17 +73,20 @@ void rtems_fatal_error_occurred(
 ) RTEMS_NO_RETURN;
 
 /**
- * @brief Invokes the internal error handler with is internal set to false.
+ * @brief Terminates the system.
  *
- * @param[in] source is the fatal source.
- * @param[in] error is the fatal code.
+ * @param[in] fatal_source The fatal source.
+ * @param[in] error_code The error code.
  *
  * @see _Terminate().
  */
-void rtems_fatal(
-  rtems_fatal_source source,
-  rtems_fatal_code error
-) RTEMS_NO_RETURN;
+RTEMS_INLINE_ROUTINE void rtems_fatal(
+  rtems_fatal_source fatal_source,
+  rtems_fatal_code   error_code
+)
+{
+  _Terminate( fatal_source, error_code );
+}
 
 /**
  * @brief Returns a text for a fatal source.
diff --git a/cpukit/sapi/src/exshutdown.c b/cpukit/sapi/src/exshutdown.c
index 9306eaf897..4f700916ec 100644
--- a/cpukit/sapi/src/exshutdown.c
+++ b/cpukit/sapi/src/exshutdown.c
@@ -18,7 +18,7 @@
 
 void rtems_shutdown_executive( uint32_t result )
 {
-  _Terminate( RTEMS_FATAL_SOURCE_EXIT, false, result );
+  _Terminate( RTEMS_FATAL_SOURCE_EXIT, result );
 
   /***************************************************************
    ***************************************************************
diff --git a/cpukit/sapi/src/fatal.c b/cpukit/sapi/src/fatal.c
index 684e878b60..4a0314a548 100644
--- a/cpukit/sapi/src/fatal.c
+++ b/cpukit/sapi/src/fatal.c
@@ -30,7 +30,7 @@ void rtems_fatal_error_occurred(
   uint32_t   the_error
 )
 {
-  _Terminate( INTERNAL_ERROR_RTEMS_API, FALSE, the_error );
+  _Terminate( INTERNAL_ERROR_RTEMS_API, the_error );
 
 /* will not return from this routine */
 }
diff --git a/cpukit/sapi/src/fatal2.c b/cpukit/sapi/src/fatal2.c
deleted file mode 100644
index faa9cdb774..0000000000
--- a/cpukit/sapi/src/fatal2.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @file
- *
- * @brief Invokes the internal error handler with is internal set to false.
- *
- * @ingroup ClassicFatal
- */
-
-/*
- * Copyright (c) 2012 embedded brains GmbH.  All rights reserved.
- *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems@embedded-brains.de>
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.org/license/LICENSE.
- */
-
-#if HAVE_CONFIG_H
-  #include "config.h"
-#endif
-
-#include <rtems/fatal.h>
-
-void rtems_fatal(
-  rtems_fatal_source source,
-  rtems_fatal_code error
-)
-{
-  _Terminate( source, false, error );
-}
diff --git a/cpukit/sapi/src/posixapi.c b/cpukit/sapi/src/posixapi.c
index d1de103f18..e7d34fdf60 100644
--- a/cpukit/sapi/src/posixapi.c
+++ b/cpukit/sapi/src/posixapi.c
@@ -25,5 +25,5 @@ void _POSIX_Fatal_error( POSIX_Fatal_domain domain, int eno )
 {
   uint32_t code = ( domain << 8 ) | ( ( uint32_t ) eno & 0xffU );
 
-  _Terminate( INTERNAL_ERROR_POSIX_API, false, code );
+  _Terminate( INTERNAL_ERROR_POSIX_API, code );
 }