diff --git a/ChangeLog b/ChangeLog
index 15e2f21..9c6b585 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 	(svc): Ditto.
 	(chx_wakeup): Set -> for the return value of chx_sched.
 	(chopstx_mutex_lock, chopstx_cancel): Likewise.
+	(chopstx_exit): Remove naked attribute.
 
 2017-06-21  NIIBE Yutaka  <gniibe@fsij.org>
 
diff --git a/chopstx.c b/chopstx.c
index 94113ea..6dc1da5 100644
--- a/chopstx.c
+++ b/chopstx.c
@@ -1497,12 +1497,6 @@ chopstx_cleanup_pop (int execute)
 }
 
 
-/*
- *  We put "naked" attribute to chopstx_exit function.  Since it never
- *  returns, function prologue is not needed.
- */
-void chopstx_exit (void *retval) __attribute__ ((naked));
-
 /**
  * chopstx_exit - Terminate the execution of running thread
  * @retval: Return value (to be caught by a joining thread)