Index: kernel/arch/sparc64/src/mm/tlb.c
===================================================================
--- kernel/arch/sparc64/src/mm/tlb.c	(revision cc85fb9f57fb5f9af22419eb0ee58d9548d3c7d1)
+++ kernel/arch/sparc64/src/mm/tlb.c	(revision 341140c181e949962d7871bd75d6e9f74ba669d1)
@@ -226,5 +226,5 @@
 		if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
 			do_fast_instruction_access_mmu_miss_fault(istate,
-			    __FUNCTION__);
+			    __func__);
 		}
 	}
@@ -254,5 +254,5 @@
 			/* NULL access in kernel */
 			do_fast_data_access_mmu_miss_fault(istate, tag,
-			    __FUNCTION__);
+			    __func__);
 		}
 		do_fast_data_access_mmu_miss_fault(istate, tag, "Unexpected "
@@ -281,5 +281,5 @@
 		if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
 			do_fast_data_access_mmu_miss_fault(istate, tag,
-			    __FUNCTION__);
+			    __func__);
 		}
 	}
@@ -327,5 +327,5 @@
 		if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
 			do_fast_data_access_protection_fault(istate, tag,
-			    __FUNCTION__);
+			    __func__);
 		}
 	}
Index: kernel/arch/sparc64/src/smp/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/smp.c	(revision cc85fb9f57fb5f9af22419eb0ee58d9548d3c7d1)
+++ kernel/arch/sparc64/src/smp/smp.c	(revision 341140c181e949962d7871bd75d6e9f74ba669d1)
@@ -101,5 +101,5 @@
 		if (waitq_sleep_timeout(&ap_completion_wq, 1000000, SYNCH_FLAGS_NONE) == ESYNCH_TIMEOUT)
 			printf("%s: waiting for processor (mid = %d) timed out\n",
-			    __FUNCTION__, mid);
+			    __func__, mid);
 	}
 }
Index: kernel/arch/sparc64/src/trap/exception.c
===================================================================
--- kernel/arch/sparc64/src/trap/exception.c	(revision cc85fb9f57fb5f9af22419eb0ee58d9548d3c7d1)
+++ kernel/arch/sparc64/src/trap/exception.c	(revision 341140c181e949962d7871bd75d6e9f74ba669d1)
@@ -54,7 +54,7 @@
 void instruction_access_exception(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -62,7 +62,7 @@
 void instruction_access_error(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -70,7 +70,7 @@
 void illegal_instruction(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -78,7 +78,7 @@
 void privileged_opcode(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -86,7 +86,7 @@
 void unimplemented_LDD(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -94,7 +94,7 @@
 void unimplemented_STD(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -114,7 +114,7 @@
 	scheduler_fpu_lazy_request();
 #else
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 #endif
 }
@@ -123,7 +123,7 @@
 void fp_exception_ieee_754(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -131,7 +131,7 @@
 void fp_exception_other(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -139,7 +139,7 @@
 void tag_overflow(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -147,7 +147,7 @@
 void division_by_zero(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -155,8 +155,8 @@
 void data_access_exception(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
 	dump_istate(istate);
 	dump_sfsr_and_sfar();
-	panic("%s\n", __FUNCTION__);
+	panic("%s\n", __func__);
 }
 
@@ -164,7 +164,7 @@
 void data_access_error(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -172,7 +172,7 @@
 void mem_address_not_aligned(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -180,7 +180,7 @@
 void LDDF_mem_address_not_aligned(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -188,7 +188,7 @@
 void STDF_mem_address_not_aligned(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -196,7 +196,7 @@
 void privileged_action(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -204,7 +204,7 @@
 void LDQF_mem_address_not_aligned(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }
 
@@ -212,7 +212,7 @@
 void STQF_mem_address_not_aligned(int n, istate_t *istate)
 {
-	fault_if_from_uspace(istate, "%s\n", __FUNCTION__);
-	dump_istate(istate);
-	panic("%s\n", __FUNCTION__);
+	fault_if_from_uspace(istate, "%s\n", __func__);
+	dump_istate(istate);
+	panic("%s\n", __func__);
 }