commit - 1c55ad1b08ae934858f530f9ea3f73a9cf320a00
commit + 7f6f093b057288deacfdb1fcd892e1cd5405f106
blob - 06b20118d2b0419683cd91c91f23a027a9fdfc11
blob + 6cf86c47f47c1b77f7abc824865077a43f319887
--- aim64/cpu.c
+++ aim64/cpu.c
@@ -137,7 +137,7 @@ ppc64_scale_frequency(u_int freq_scale)
 
 	/* Wait until frequency change is completed. */
 	do {
-		ppc64_mtscomc((SCOM_PSR << SCOMC_ADDR_SHIFT) | SCOMC_READ);
+		ppc_mtscomc((SCOM_PSR << SCOMC_ADDR_SHIFT) | SCOMC_READ);
 		psr = ppc64_mfscomd();
 		ppc64_mfscomc();
 		if (psr & PSR_CMD_COMPLETED)
@@ -262,7 +262,7 @@ cpuattach(struct device *parent, struct device *dev, v
 		int s;
 
 		s = ppc_intr_disable();
-		ppc64_mtscomc((SCOM_PSR << SCOMC_ADDR_SHIFT) | SCOMC_READ);
+		ppc_mtscomc((SCOM_PSR << SCOMC_ADDR_SHIFT) | SCOMC_READ);
 		psr = ppc64_mfscomd();
 		ppc64_mfscomc();
 		ppc_intr_enable(s);
blob - f3300f83eeefaef92728e9284c8e1353166f8dd9
blob + 85b60108820cfcc924beb44632aae034ffb3fc7e
--- aim64/locore.S
+++ aim64/locore.S
@@ -1191,10 +1191,12 @@ _C_LABEL(rfi_start):
 	.llong	0, 0
 
 
+#if 0
 	.globl  _C_LABEL(nopbat_start)
 _C_LABEL(nopbat_start):
 	.llong	nopbat_1s, nopbat_1e
 	.llong	0, 0
+#endif
 
 	.globl  _C_LABEL(nop32_start)
 _C_LABEL(nop32_start):
blob - bbbf23cc702ae8c4a0204c9426b1419d7e352b7a
blob + 7bc277aace130308a2a1b41f6c7ab6fb5e8fa5fd
--- aim64/locore0.S
+++ aim64/locore0.S
@@ -55,16 +55,17 @@
 	.type	_C_LABEL(esym),@object
 	.type	_C_LABEL(proc0paddr),@object
 	.data
+	.align 3
 _C_LABEL(esym):		.llong 0	/* end of symbol table */
 _C_LABEL(proc0paddr):	.llong 0	/* proc0 p_addr */
 
 	.globl	fwargsave
-	.align 3
 fwargsave:
 			.llong 0
 			.llong 0
 
 	.text
+	.align 3
 /*
  * Startup entry
  */
blob - 9e338967331a74cb32b105078a8c4535f5941052
blob + 66dc46bb69d57f17ab6cf421cc29be28e683e840
--- aim64/machdep.c
+++ aim64/machdep.c
@@ -340,13 +340,13 @@ install_extint(void (*handler)(void))
 #endif
 	omsr = ppc_mfmsr();
 	msr = omsr & ~PSL_EE;
-	ppc_mtmsr(msr);
+	ppc_mtmsrd(msr);
 	offset &= 0x3ffffff;
 	extint_call = (extint_call & 0xfc000003) | offset;
 	bcopy(&extint, (void *)EXC_EXI, (size_t)&extsize);
 	syncicache((void *)&extint_call, sizeof extint_call);
 	syncicache((void *)EXC_EXI, (int)&extsize);
-	ppc_mtmsr(omsr);
+	ppc_mtmsrd(omsr);
 }
 
 /*