diff --git a/core/cpu.c b/core/cpu.c
index d0e4cdc1c038..99d016f0d90a 100644
--- a/core/cpu.c
+++ b/core/cpu.c
@@ -739,7 +739,7 @@ struct cpu_thread *find_cpu_by_pir(u32 pir)
 	return &cpu_stacks[pir].cpu;
 }
 
-struct __nomcount cpu_thread *find_cpu_by_pir_nomcount(u32 pir)
+struct cpu_thread __nomcount *find_cpu_by_pir_nomcount(u32 pir)
 {
 	if (pir > cpu_max_pir)
 		return NULL;
diff --git a/include/cpu.h b/include/cpu.h
index cda78644dfe9..5fdcc9862ac7 100644
--- a/include/cpu.h
+++ b/include/cpu.h
@@ -153,7 +153,7 @@ extern struct cpu_thread *find_cpu_by_server(u32 server_no);
 extern struct cpu_thread *find_cpu_by_pir(u32 pir);
 
 /* Used for lock internals to avoid re-entrancy */
-extern struct __nomcount cpu_thread *find_cpu_by_pir_nomcount(u32 pir);
+extern struct cpu_thread __nomcount *find_cpu_by_pir_nomcount(u32 pir);
 
 extern struct dt_node *get_cpu_node(u32 pir);