Module Name: src Committed By: rin Date: Mon Sep 12 06:19:14 UTC 2022
Modified Files: src/sys/arch/powerpc/ibm4xx: trap.c Log Message: copyin(): Remove one more needless mtpid. No regression for full ATF. To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/sys/arch/powerpc/ibm4xx/trap.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/trap.c diff -u src/sys/arch/powerpc/ibm4xx/trap.c:1.95 src/sys/arch/powerpc/ibm4xx/trap.c:1.96 --- src/sys/arch/powerpc/ibm4xx/trap.c:1.95 Sun Sep 11 09:27:18 2022 +++ src/sys/arch/powerpc/ibm4xx/trap.c Mon Sep 12 06:19:14 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.95 2022/09/11 09:27:18 rin Exp $ */ +/* $NetBSD: trap.c,v 1.96 2022/09/12 06:19:14 rin Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -69,7 +69,7 @@ #define __UFETCHSTORE_PRIVATE #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.95 2022/09/11 09:27:18 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.96 2022/09/12 06:19:14 rin Exp $"); #ifdef _KERNEL_OPT #include "opt_ddb.h" @@ -498,8 +498,7 @@ copyin(const void *uaddr, void *kaddr, s "dcbst 0,%[kaddr];" /* flush cache */ "sync;" - "10:" "mtpid %[pid];" /* Restore PID and MSR */ - "mtmsr %[msr];" + "10:" "mtmsr %[msr];" /* Restore MSR */ "isync;" : [msr] "=&r" (msr), [pid] "=&r" (pid), [tmp] "=&r" (tmp)