From owner-svn-src-projects@FreeBSD.ORG Fri Jan 27 14:50:16 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 199701065675; Fri, 27 Jan 2012 14:50:16 +0000 (UTC) (envelope-from cognet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DE7FD8FC15; Fri, 27 Jan 2012 14:50:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0REoFED043966; Fri, 27 Jan 2012 14:50:15 GMT (envelope-from cognet@svn.freebsd.org) Received: (from cognet@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0REoF2a043962; Fri, 27 Jan 2012 14:50:15 GMT (envelope-from cognet@svn.freebsd.org) Message-Id: <201201271450.q0REoF2a043962@svn.freebsd.org> From: Olivier Houchard Date: Fri, 27 Jan 2012 14:50:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r230616 - in projects/armv6/sys/arm: arm omap/omap4 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2012 14:50:16 -0000 Author: cognet Date: Fri Jan 27 14:50:15 2012 New Revision: 230616 URL: http://svn.freebsd.org/changeset/base/230616 Log: Move get_pcpu and friends from the pj4b file to the armv7 file, where they really belong. Submitted by: dmarion Modified: projects/armv6/sys/arm/arm/cpufunc_asm_armv7.S projects/armv6/sys/arm/arm/cpufunc_asm_pj4b.S projects/armv6/sys/arm/omap/omap4/files.omap44xx Modified: projects/armv6/sys/arm/arm/cpufunc_asm_armv7.S ============================================================================== --- projects/armv6/sys/arm/arm/cpufunc_asm_armv7.S Fri Jan 27 14:46:25 2012 (r230615) +++ projects/armv6/sys/arm/arm/cpufunc_asm_armv7.S Fri Jan 27 14:50:15 2012 (r230616) @@ -229,3 +229,21 @@ ENTRY(armv7_context_switch) ENTRY(armv7_drain_writebuf) dsb RET + +/* Use Privileged Thread Id register as a holder for pcpu pointer */ +ENTRY(get_pcpu) + mrc p15, 0, r0, c13, c0, 4 + RET + +ENTRY(set_pcpu) + mcr p15, 0, r0, c13, c0, 4 + RET + +/* Use Privileged Thread Id register as a holder for tls pointer */ +ENTRY(get_tls) + mrc p15, 0, r0, c13, c0, 3 + RET + +ENTRY(set_tls) + mcr p15, 0, r0, c13, c0, 3 + RET Modified: projects/armv6/sys/arm/arm/cpufunc_asm_pj4b.S ============================================================================== --- projects/armv6/sys/arm/arm/cpufunc_asm_pj4b.S Fri Jan 27 14:46:25 2012 (r230615) +++ projects/armv6/sys/arm/arm/cpufunc_asm_pj4b.S Fri Jan 27 14:50:15 2012 (r230616) @@ -180,24 +180,6 @@ ENTRY(get_core_id) mrc p15, 0, r0, c0, c0, 5 RET -/* Use Privileged Thread Id register as a holder for pcpu pointer */ -ENTRY(get_pcpu) - mrc p15, 0, r0, c13, c0, 4 - RET - -ENTRY(set_pcpu) - mcr p15, 0, r0, c13, c0, 4 - RET - -/* Use Privileged Thread Id register as a holder for tls pointer */ -ENTRY(get_tls) - mrc p15, 0, r0, c13, c0, 3 - RET - -ENTRY(set_tls) - mcr p15, 0, r0, c13, c0, 3 - RET - ENTRY(pj4b_config) /* Set Auxiliary Debug Modes Control 2 register */ mrc p15, 1, r0, c15, c1, 2 Modified: projects/armv6/sys/arm/omap/omap4/files.omap44xx ============================================================================== --- projects/armv6/sys/arm/omap/omap4/files.omap44xx Fri Jan 27 14:46:25 2012 (r230615) +++ projects/armv6/sys/arm/omap/omap4/files.omap44xx Fri Jan 27 14:50:15 2012 (r230616) @@ -8,7 +8,6 @@ arm/arm/cpufunc_asm_armv5.S standard arm/arm/cpufunc_asm_arm10.S standard arm/arm/cpufunc_asm_arm11.S standard arm/arm/cpufunc_asm_armv7.S standard -arm/arm/cpufunc_asm_pj4b.S standard arm/arm/irq_dispatch.S standard arm/omap/omap_machdep.c standard @@ -17,7 +16,6 @@ arm/omap/omap_cpuid.c standard arm/omap/omap_prcm.c standard arm/omap/omap_scm.c standard arm/omap/omap_if.m standard -arm/omap/omap_space_asm.S standard arm/omap/omap4/omap4_if.m standard arm/omap/omap4/omap44xx.c standard