diff options
| -rw-r--r-- | sys/sparc64/sparc64/genassym.c | 1 | ||||
| -rw-r--r-- | sys/sun4v/include/pcpu.h | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/sys/sparc64/sparc64/genassym.c b/sys/sparc64/sparc64/genassym.c index a1de670..ec237bf 100644 --- a/sys/sparc64/sparc64/genassym.c +++ b/sys/sparc64/sparc64/genassym.c @@ -209,7 +209,6 @@ ASSYM(PC_CNT, offsetof(struct pcpu, pc_cnt)); ASSYM(PC_SIZEOF, sizeof(struct pcpu)); #ifdef SUN4V -ASSYM(PC_CALLER, offsetof(struct pcpu, pc_caller)); ASSYM(PC_CPU_Q_RA, offsetof(struct pcpu, pc_cpu_q_ra)); ASSYM(PC_CPU_Q_SIZE, offsetof(struct pcpu, pc_cpu_q_size)); ASSYM(PC_DEV_Q_RA, offsetof(struct pcpu, pc_dev_q_ra)); diff --git a/sys/sun4v/include/pcpu.h b/sys/sun4v/include/pcpu.h index 1581922..c9f0b63 100644 --- a/sys/sun4v/include/pcpu.h +++ b/sys/sun4v/include/pcpu.h @@ -68,16 +68,13 @@ struct pmap; vm_paddr_t pc_nrq_ra; \ uint64_t pc_nrq_size; \ u_long pc_tickref; \ - u_long pc_lookup_field; \ - u_long pc_last_field; \ u_long pc_tickadj; \ struct rwindow pc_kwbuf; \ u_long pc_kwbuf_sp; \ u_int pc_kwbuf_full; \ struct rwindow pc_tsbwbuf[2]; \ - uint64_t pc_caller; \ uint16_t pc_cpulist[MAXCPU]; \ - uint64_t pad[8]; + uint64_t pad[11]; /* XXX SUN4V_FIXME - as we access the *_ra and *_size fields in quick * succession we _really_ want them to be L1 cache line size aligned |
