Index: kernel/generic/include/panic.h
===================================================================
--- kernel/generic/include/panic.h	(revision 48d14222860ca12971697753b0daddbe991a80d4)
+++ kernel/generic/include/panic.h	(revision 3ee8a07528aa466b40a362672714a05e936d396e)
@@ -37,5 +37,5 @@
 
 #ifdef CONFIG_DEBUG
-#	define panic(format, ...) panic_printf("Kernel panic in %s() at %s on line %d: " format, __FUNCTION__, __FILE__, __LINE__, ##__VA_ARGS__);
+#	define panic(format, ...) panic_printf("Kernel panic in %s() at %s on line %d: " format, __func__, __FILE__, __LINE__, ##__VA_ARGS__);
 #else
 #	define panic(format, ...) panic_printf("Kernel panic: " format, ##__VA_ARGS__);
Index: kernel/generic/include/synch/spinlock.h
===================================================================
--- kernel/generic/include/synch/spinlock.h	(revision 48d14222860ca12971697753b0daddbe991a80d4)
+++ kernel/generic/include/synch/spinlock.h	(revision 3ee8a07528aa466b40a362672714a05e936d396e)
@@ -113,5 +113,5 @@
 		printf("Deadlock probe %s: exceeded threshold %d\n",	\
 		    "cpu%d: function=%s, line=%d\n",			\
-		    #pname, (value), CPU->id, __FUNCTION__, __LINE__);	\
+		    #pname, (value), CPU->id, __func__, __LINE__);	\
 	}
 #else
Index: kernel/generic/src/console/kconsole.c
===================================================================
--- kernel/generic/src/console/kconsole.c	(revision 48d14222860ca12971697753b0daddbe991a80d4)
+++ kernel/generic/src/console/kconsole.c	(revision 3ee8a07528aa466b40a362672714a05e936d396e)
@@ -412,5 +412,5 @@
 
 	if (!stdin) {
-		printf("%s: no stdin\n", __FUNCTION__);
+		printf("%s: no stdin\n", __func__);
 		return;
 	}