PERFORCE change 92573 for review

[Kip Macy]

http://perforce.freebsd.org/chv.cgi?CH=92573

Change 92573 by kmacy at kmacy_storage:sun4v_work on 2006/03/01 07:38:13

	disable symbols not found under sun4v

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#5 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#5 (text+ko) ====

@@ -99,7 +99,6 @@
 ASSYM(TLB_DEMAP_PRIMARY, TLB_DEMAP_PRIMARY);
 ASSYM(TLB_DEMAP_CONTEXT, TLB_DEMAP_CONTEXT);
 ASSYM(TLB_DEMAP_PAGE, TLB_DEMAP_PAGE);
-ASSYM(TLB_DIRECT_TO_TTE_MASK, TLB_DIRECT_TO_TTE_MASK);
 
 ASSYM(TSB_BUCKET_MASK, TSB_BUCKET_MASK);
 ASSYM(TSB_BUCKET_SHIFT, TSB_BUCKET_SHIFT);
@@ -120,8 +119,9 @@
 ASSYM(CSA_STATE, offsetof(struct cpu_start_args, csa_state));
 ASSYM(CSA_TICK, offsetof(struct cpu_start_args, csa_tick));
 ASSYM(CSA_VER, offsetof(struct cpu_start_args, csa_ver));
+#ifndef SUN4V
 ASSYM(CSA_TTES, offsetof(struct cpu_start_args, csa_ttes));
-
+#endif
 ASSYM(DC_TAG_SHIFT, DC_TAG_SHIFT);
 ASSYM(DC_TAG_MASK, DC_TAG_MASK);
 ASSYM(DC_VALID_SHIFT, DC_VALID_SHIFT);
@@ -151,9 +151,10 @@
 ASSYM(KTR_PARM5, offsetof(struct ktr_entry, ktr_parms[4]));
 ASSYM(KTR_PARM6, offsetof(struct ktr_entry, ktr_parms[5]));
 
+ASSYM(TTE_SHIFT, TTE_SHIFT);
+#ifndef SUN4V
 ASSYM(TTE_VPN, offsetof(struct tte, tte_vpn));
 ASSYM(TTE_DATA, offsetof(struct tte, tte_data));
-ASSYM(TTE_SHIFT, TTE_SHIFT);
 
 ASSYM(TD_EXEC, TD_EXEC);
 ASSYM(TD_REF, TD_REF);
@@ -167,8 +168,9 @@
 
 ASSYM(TS_MIN, TS_MIN);
 ASSYM(TS_MAX, TS_MAX);
-
+ASSYM(TLB_DIRECT_TO_TTE_MASK, TLB_DIRECT_TO_TTE_MASK);
 ASSYM(TV_SIZE_BITS, TV_SIZE_BITS);
+#endif
 
 ASSYM(V_INTR, offsetof(struct vmmeter, v_intr));
 
@@ -183,10 +185,26 @@
 ASSYM(PC_TLB_CTX, offsetof(struct pcpu, pc_tlb_ctx));
 ASSYM(PC_TLB_CTX_MAX, offsetof(struct pcpu, pc_tlb_ctx_max));
 ASSYM(PC_TLB_CTX_MIN, offsetof(struct pcpu, pc_tlb_ctx_min));
-ASSYM(PC_PMAP, offsetof(struct pcpu, pc_pmap));
 ASSYM(PC_CNT, offsetof(struct pcpu, pc_cnt));
 ASSYM(PC_SIZEOF, sizeof(struct pcpu));
 
+#ifdef SUN4V
+ASSYM(PC_CPU_Q_BASE, offsetof(struct pcpu, pc_cpu_q_ra));
+ASSYM(PC_CPU_Q_SIZE, offsetof(struct pcpu, pc_cpu_q_size));
+ASSYM(PC_DEV_Q_BASE, offsetof(struct pcpu, pc_dev_q_ra));
+ASSYM(PC_DEV_Q_SIZE, offsetof(struct pcpu, pc_dev_q_size));
+
+ASSYM(PC_RQ_BASE, offsetof(struct pcpu, pc_rq_ra));
+ASSYM(PC_RQ_SIZE, offsetof(struct pcpu, pc_rq_size));
+ASSYM(PC_NRQ_BASE, offsetof(struct pcpu, pc_nrq_ra));
+ASSYM(PC_NRQ_SIZE, offsetof(struct pcpu, pc_nrq_size));
+#else
+ASSYM(PC_PMAP, offsetof(struct pcpu, pc_pmap));
+ASSYM(PM_TSB, offsetof(struct pmap, pm_tsb));
+#endif 
+
+
+
 ASSYM(IH_SHIFT, IH_SHIFT);
 
 ASSYM(IRSR_BUSY, IRSR_BUSY);
@@ -247,7 +265,7 @@
 ASSYM(VM_PMAP, offsetof(struct vmspace, vm_pmap));
 ASSYM(PM_ACTIVE, offsetof(struct pmap, pm_active));
 ASSYM(PM_CONTEXT, offsetof(struct pmap, pm_context));
-ASSYM(PM_TSB, offsetof(struct pmap, pm_tsb));
+
 
 ASSYM(SF_UC, offsetof(struct sigframe, sf_uc));