diff --git a/src/gos/chibios.h b/src/gos/chibios.h
index e0b95707..a07c72ab 100644
--- a/src/gos/chibios.h
+++ b/src/gos/chibios.h
@@ -77,14 +77,15 @@ extern "C" {
 	#define gfxSystemTicks()			chTimeNow()
 	#define gfxMutexInit(pmutex)		chMtxInit(pmutex)
 	#define gfxMutexExit(pmutex)		chMtxUnlock()
+	#define gfxExit()					chSysHalt()
 #elif CH_KERNEL_MAJOR == 3
 	#define gfxSystemTicks()			chVTGetSystemTimeX()
 	#define gfxMutexInit(pmutex)		chMtxObjectInit(pmutex)
 	#define gfxMutexExit(pmutex)		chMtxUnlock(pmutex)
+	#define gfxExit()					osalSysHalt("gfx_exit")
 #endif
 
 #define gfxHalt(msg)				{ chDbgPanic(msg); chSysHalt(); }
-#define gfxExit()					chSysHalt()
 #define gfxAlloc(sz)				chHeapAlloc(0, sz)
 #define gfxFree(ptr)				chHeapFree(ptr)
 #define gfxYield()					chThdYield()