svn commit: r230616 - in projects/armv6/sys/arm: arm omap/omap4

[Olivier Houchard]

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