Module Name: src
Committed By: rin
Date: Thu Mar 5 01:15:35 UTC 2020
Modified Files:
src/sys/arch/powerpc/ibm4xx: copyinstr.c copyoutstr.c
Log Message:
Cosmetic changes. No binary changes.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/ibm4xx/copyinstr.c \
src/sys/arch/powerpc/ibm4xx/copyoutstr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/ibm4xx/copyinstr.c
diff -u src/sys/arch/powerpc/ibm4xx/copyinstr.c:1.12 src/sys/arch/powerpc/ibm4xx/copyinstr.c:1.13
--- src/sys/arch/powerpc/ibm4xx/copyinstr.c:1.12 Thu Mar 5 01:13:00 2020
+++ src/sys/arch/powerpc/ibm4xx/copyinstr.c Thu Mar 5 01:15:35 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: copyinstr.c,v 1.12 2020/03/05 01:13:00 rin Exp $ */
+/* $NetBSD: copyinstr.c,v 1.13 2020/03/05 01:15:35 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: copyinstr.c,v 1.12 2020/03/05 01:13:00 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: copyinstr.c,v 1.13 2020/03/05 01:15:35 rin Exp $");
#include <sys/param.h>
#include <uvm/uvm_extern.h>
@@ -82,12 +82,13 @@ copyinstr(const void *udaddr, void *kadd
"mtpid %4; sync;" /* Load user ctx */
"lbz %2,0(%5); addi %5,%5,1;" /* Load byte */
"sync; isync;"
- "mtpid %1;sync;"
+ "mtpid %1; sync;"
"stb %2,0(%6); dcbst 0,%6; addi %6,%6,1;"
/* Store kernel byte */
"sync; isync;"
"or. %2,%2,%2;"
"bdnzf 2,1b;" /* while(ctr-- && !zero) */
+
"mtpid %1; mtmsr %0;" /* Restore PID, MSR */
"sync; isync;"
"mfctr %3;" /* Restore resid */
Index: src/sys/arch/powerpc/ibm4xx/copyoutstr.c
diff -u src/sys/arch/powerpc/ibm4xx/copyoutstr.c:1.12 src/sys/arch/powerpc/ibm4xx/copyoutstr.c:1.13
--- src/sys/arch/powerpc/ibm4xx/copyoutstr.c:1.12 Thu Mar 5 01:13:00 2020
+++ src/sys/arch/powerpc/ibm4xx/copyoutstr.c Thu Mar 5 01:15:35 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: copyoutstr.c,v 1.12 2020/03/05 01:13:00 rin Exp $ */
+/* $NetBSD: copyoutstr.c,v 1.13 2020/03/05 01:15:35 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: copyoutstr.c,v 1.12 2020/03/05 01:13:00 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: copyoutstr.c,v 1.13 2020/03/05 01:15:35 rin Exp $");
#include <sys/param.h>
#include <uvm/uvm_extern.h>
@@ -79,7 +79,7 @@ copyoutstr(const void *kaddr, void *udad
"sync; isync;"
"1:"
- "mtpid %1;sync;"
+ "mtpid %1; sync;"
"lbz %2,0(%6); addi %6,%6,1;" /* Store kernel byte */
"sync; isync;"
"mtpid %4; sync;" /* Load user ctx */
