Index: powerpc64/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/powerpc64/include/cpu.h,v
retrieving revision 1.4
diff -u -p -r1.4 cpu.h
--- powerpc64/include/cpu.h	17 May 2020 23:27:44 -0000	1.4
+++ powerpc64/include/cpu.h	18 May 2020 03:38:21 -0000
@@ -25,7 +25,7 @@ struct cpu_info {
 
 extern struct cpu_info cpu_info_primary;
 
-register struct cpu_info *__curcpu asm("r13");
+register struct cpu_info * const __curcpu asm("r13");
 #define curcpu()	__curcpu
 
 #define MAXCPUS			1
Index: sparc64/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/include/cpu.h,v
retrieving revision 1.93
diff -u -p -r1.93 cpu.h
--- sparc64/include/cpu.h	5 Dec 2018 10:28:21 -0000	1.93
+++ sparc64/include/cpu.h	18 May 2020 03:38:21 -0000
@@ -172,7 +172,7 @@ extern struct cpu_info *cpus;
 
 #ifdef MULTIPROCESSOR
 
-register struct cpu_info *__curcpu asm ("g7");
+register struct cpu_info * const __curcpu asm ("g7");
 
 #define curcpu()	(__curcpu->ci_self)
 #define cpu_number()	(__curcpu->ci_cpuid)