Date: Wed, 29 Feb 2012 22:21:59 +0000 (UTC) From: Olivier Houchard <cognet@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r232319 - projects/armv6/sys/arm/arm Message-ID: <201202292221.q1TMLxPA047636@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cognet Date: Wed Feb 29 22:21:58 2012 New Revision: 232319 URL: http://svn.freebsd.org/changeset/base/232319 Log: We shouldn't dereference curthread here Modified: projects/armv6/sys/arm/arm/swtch.S Modified: projects/armv6/sys/arm/arm/swtch.S ============================================================================== --- projects/armv6/sys/arm/arm/swtch.S Wed Feb 29 22:06:44 2012 (r232318) +++ projects/armv6/sys/arm/arm/swtch.S Wed Feb 29 22:21:58 2012 (r232319) @@ -348,7 +348,6 @@ ENTRY(cpu_switch) beq .Lcs_same_vector str r0, [r7] /* Otherwise, update it */ -#if !defined(CPU_ARM11) && !defined(CPU_CORTEXA) && !defined(CPU_MV_PJ4B) /* * Need to sync the cache to make sure that last store is * visible to the MMU. @@ -358,7 +357,6 @@ ENTRY(cpu_switch) mov r1, #4 mov lr, pc ldr pc, [r2, #CF_DCACHE_WB_RANGE] -#endif .Lcs_same_vector: #endif /* PMAP_INCLUDE_PTE_SYNC */ @@ -396,7 +394,6 @@ ENTRY(cpu_switch) str r6, [r4, #TD_LOCK] ldr r6, .Lblocked_lock GET_CURTHREAD_PTR(r3) - ldr r3, [r3] 1: ldr r4, [r3, #TD_LOCK]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202292221.q1TMLxPA047636>