svn commit: r284109 - in head/sys/arm: arm include

[Andrew Turner]

Author: andrew
Date: Sun Jun  7 10:50:15 2015
New Revision: 284109
URL: https://svnweb.freebsd.org/changeset/base/284109

Log:
  Remove pc_cpu, it was duplicating pc_cpuid so was unneeded.

Modified:
  head/sys/arm/arm/genassym.c
  head/sys/arm/arm/machdep.c
  head/sys/arm/arm/mp_machdep.c
  head/sys/arm/arm/vfp.c
  head/sys/arm/include/pcpu.h

Modified: head/sys/arm/arm/genassym.c
==============================================================================
--- head/sys/arm/arm/genassym.c	Sun Jun  7 10:01:59 2015	(r284108)
+++ head/sys/arm/arm/genassym.c	Sun Jun  7 10:50:15 2015	(r284109)
@@ -133,8 +133,6 @@ ASSYM(ARM_RAS_END, ARM_RAS_END);
 #ifdef VFP
 ASSYM(PCB_VFPSTATE, offsetof(struct pcb, pcb_vfpstate));
 
-ASSYM(PC_CPU, offsetof(struct pcpu, pc_cpu));
-
 ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap));
 #endif
 

Modified: head/sys/arm/arm/machdep.c
==============================================================================
--- head/sys/arm/arm/machdep.c	Sun Jun  7 10:01:59 2015	(r284108)
+++ head/sys/arm/arm/machdep.c	Sun Jun  7 10:50:15 2015	(r284109)
@@ -916,9 +916,6 @@ pcpu0_init(void)
 #endif
 	pcpu_init(pcpup, 0, sizeof(struct pcpu));
 	PCPU_SET(curthread, &thread0);
-#ifdef VFP
-	PCPU_SET(cpu, 0);
-#endif
 }
 
 #if defined(LINUX_BOOT_ABI)

Modified: head/sys/arm/arm/mp_machdep.c
==============================================================================
--- head/sys/arm/arm/mp_machdep.c	Sun Jun  7 10:01:59 2015	(r284108)
+++ head/sys/arm/arm/mp_machdep.c	Sun Jun  7 10:50:15 2015	(r284109)
@@ -197,8 +197,6 @@ init_secondary(int cpu)
 	pc->pc_curpcb = pc->pc_idlethread->td_pcb;
 	set_curthread(pc->pc_idlethread);
 #ifdef VFP
-	pc->pc_cpu = cpu;
-
 	vfp_init();
 #endif
 

Modified: head/sys/arm/arm/vfp.c
==============================================================================
--- head/sys/arm/arm/vfp.c	Sun Jun  7 10:01:59 2015	(r284108)
+++ head/sys/arm/arm/vfp.c	Sun Jun  7 10:50:15 2015	(r284109)
@@ -199,7 +199,7 @@ vfp_bounce(u_int addr, u_int insn, struc
 	 */
 	fmxr(fpexc, fpexc | VFPEXC_EN);
 	curpcb = curthread->td_pcb;
-	cpu = PCPU_GET(cpu);
+	cpu = PCPU_GET(cpuid);
 	if (curpcb->pcb_vfpcpu != cpu || curthread != PCPU_GET(fpcurthread)) {
 		vfp_restore(&curpcb->pcb_vfpstate);
 		curpcb->pcb_vfpcpu = cpu;

Modified: head/sys/arm/include/pcpu.h
==============================================================================
--- head/sys/arm/include/pcpu.h	Sun Jun  7 10:01:59 2015	(r284108)
+++ head/sys/arm/include/pcpu.h	Sun Jun  7 10:50:15 2015	(r284109)
@@ -42,12 +42,11 @@ struct vmspace;
 
 #ifdef VFP
 #define PCPU_MD_FIELDS							\
-	unsigned int pc_cpu;						\
 	unsigned int pc_vfpsid;						\
 	unsigned int pc_vfpmvfr0;					\
 	unsigned int pc_vfpmvfr1;					\
 	struct pmap *pc_curpmap;					\
-	char __pad[137]
+	char __pad[141]
 #else
 #define PCPU_MD_FIELDS							\
 	char __pad[157]