Module Name: src
Committed By: ozaki-r
Date: Sun Jun 15 02:27:15 UTC 2014
Modified Files:
src/sys/arch/arm/arm32: cpuswitch.S
Log Message:
Fix wrong instruction; mcr => mrc
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/arm/arm32/cpuswitch.S
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/arm/arm32/cpuswitch.S
diff -u src/sys/arch/arm/arm32/cpuswitch.S:1.83 src/sys/arch/arm/arm32/cpuswitch.S:1.84
--- src/sys/arch/arm/arm32/cpuswitch.S:1.83 Fri Mar 28 21:52:53 2014
+++ src/sys/arch/arm/arm32/cpuswitch.S Sun Jun 15 02:27:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuswitch.S,v 1.83 2014/03/28 21:52:53 matt Exp $ */
+/* $NetBSD: cpuswitch.S,v 1.84 2014/06/15 02:27:15 ozaki-r Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -87,7 +87,7 @@
#include <arm/asm.h>
#include <arm/locore.h>
- RCSID("$NetBSD: cpuswitch.S,v 1.83 2014/03/28 21:52:53 matt Exp $")
+ RCSID("$NetBSD: cpuswitch.S,v 1.84 2014/06/15 02:27:15 ozaki-r Exp $")
/* LINTSTUB: include <sys/param.h> */
@@ -139,7 +139,7 @@ ENTRY(cpu_switchto)
#ifdef TPIDRPRW_IS_CURCPU
GET_CURCPU(r3)
#elif defined(TPIDRPRW_IS_CURLWP)
- mcr p15, 0, r0, c13, c0, 4 /* get old lwp (r4 maybe 0) */
+ mrc p15, 0, r0, c13, c0, 4 /* get old lwp (r4 maybe 0) */
ldr r3, [r0, #(L_CPU)] /* get cpu from old lwp */
#elif !defined(MULTIPROCESSOR)
ldr r3, [r6, #L_CPU] /* get cpu from new lwp */
