Update for MI switch code, and trim a heap of unused (I believe) entries.

5 files changed, 7 insertions, 208 deletions

diff --git a/sys/alpha/alpha/genassym.c b/sys/alpha/alpha/genassym.c
index aeb6483..945f537 100644
--- a/sys/alpha/alpha/genassym.c
+++ b/sys/alpha/alpha/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.6 1999/06/26 12:45:12 peter Exp $
+ *	$Id: genassym.c,v 1.7 1999/06/28 09:15:35 peter Exp $
  */
 
 #include <sys/param.h>
@@ -78,18 +78,7 @@ int	printf __P((const char *, ...));
 int
 main()
 {
-	OFF(P_FORW,		struct proc,	p_procq.tqe_next);
-	OFF(P_BACK,		struct proc,	p_procq.tqe_prev);
-	OFF(P_VMSPACE,		struct proc,	p_vmspace);
 	OFF(P_ADDR,		struct proc,	p_addr);
-	OFF(P_PRI,		struct proc,	p_priority);
-	OFF(P_RTPRIO_TYPE,	struct proc,	p_rtprio.type);
-	OFF(P_RTPRIO_PRIO,	struct proc,	p_rtprio.prio);
-	OFF(P_STAT,		struct proc,	p_stat);
-	OFF(P_WCHAN,		struct proc,	p_wchan);
-	OFF(P_FLAG,		struct proc,	p_flag);
-	OFF(P_PID,		struct proc,	p_pid);
-	OFF(P_RUNTIME,		struct proc,	p_runtime);
 	OFF(P_MD_FLAGS,		struct proc,	p_md.md_flags);
 	OFF(P_MD_PCBPADDR,	struct proc,	p_md.md_pcbpaddr);
 	OFF(P_MD_HAE,		struct proc,	p_md.md_hae);
@@ -97,53 +86,21 @@ main()
 
 	OFF(CHIPSET_WRITE_HAE,	struct alpha_chipset, write_hae);
 
-	OFF(PH_LINK,		struct prochd,	ph_link);
-	OFF(PH_RLINK,		struct prochd,	ph_rlink);
-
-	CONST1(SSLEEP);
-	CONST1(SRUN);
-
-	OFF(VM_PMAP,		struct vmspace,	vm_pmap);
-	OFF(V_TRAP,		struct vmmeter,	v_trap);
-	OFF(V_SYSCALL,		struct vmmeter,	v_trap);
-	OFF(V_INTR,		struct vmmeter,	v_trap);
-
-	CONST1(UPAGES);
-	CONST1(PAGE_SIZE);
-	CONST1(PAGE_SHIFT);
-	CONST1(PAGE_MASK);
-	CONST1(USRSTACK);
 	CONST1(VM_MAXUSER_ADDRESS);
-	CONST1(KERNBASE);
 	CONST1(PTLEV1I);
 	CONST1(PTESIZE);
 
 	OFF(U_PCB_ONFAULT,	struct user,	u_pcb.pcb_onfault);
 	OFF(U_PCB_HWPCB_KSP,	struct user,	u_pcb.pcb_hw.apcb_ksp);
 	OFF(U_PCB_CONTEXT,	struct user,	u_pcb.pcb_context);
-	OFF(U_PROFSCALE,	struct user,	u_stats.p_prof.pr_scale);
-
-	OFF(PR_BASE,		struct uprof,	pr_base);
-	OFF(PR_SIZE,		struct uprof,	pr_size);
-	OFF(PR_OFF,		struct uprof,	pr_off);
-	OFF(PR_SCALE,		struct uprof,	pr_scale);
 
-	OFF(RU_MINFLT,		struct rusage,	ru_minflt);
-	
 	OFF(PCB_HW,		struct pcb,	pcb_hw);
-	OFF(PCB_CONTEXT,	struct pcb,	pcb_context);
-	OFF(PCB_FP,		struct pcb,	pcb_fp);
-	OFF(PCB_ONFAULT,	struct pcb,	pcb_onfault);
-	OFF(PCB_ACCESSADDR,	struct pcb,	pcb_accessaddr);
 
 	OFF(FPREG_FPR_REGS,	struct fpreg,	fpr_regs);
 	OFF(FPREG_FPR_CR,	struct fpreg,	fpr_cr);
 
-	CONST1(B_READ);
-	CONST1(ENOENT);
 	CONST1(EFAULT);
 	CONST1(ENAMETOOLONG);
-	CONST1(MAXPATHLEN);
 
 	/* Register offsets, for stack frames. */
 	CONST1(FRAME_V0),
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index d541e7a..9f17b0c 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.74 1999/07/29 07:10:35 msmith Exp $
+ *	$Id: genassym.c,v 1.75 1999/07/29 08:33:00 peter Exp $
  */
 
 #include "opt_user_ldt.h"
@@ -81,19 +81,12 @@ int
 main()
 {
 
-	printf("#define\tP_FORW %#x\n", OS(proc, p_procq.tqe_next));
-	printf("#define\tP_BACK %#x\n", OS(proc, p_procq.tqe_prev));
 	printf("#define\tP_VMSPACE %#x\n", OS(proc, p_vmspace));
 	printf("#define\tVM_PMAP %#x\n", OS(vmspace, vm_pmap));
 	printf("#define\tPM_ACTIVE %#x\n", OS(pmap, pm_active));
 	printf("#define\tP_ADDR %#x\n", OS(proc, p_addr));
-	printf("#define\tP_PRI %#x\n", OS(proc, p_priority));
-	printf("#define\tP_RTPRIO_TYPE %#x\n", OS(proc, p_rtprio.type));
-	printf("#define\tP_RTPRIO_PRIO %#x\n", OS(proc, p_rtprio.prio));
 	printf("#define\tP_STAT %#x\n", OS(proc, p_stat));
 	printf("#define\tP_WCHAN %#x\n", OS(proc, p_wchan));
-	printf("#define\tP_FLAG %#x\n", OS(proc, p_flag));
-	printf("#define\tP_PID %#x\n", OS(proc, p_pid));
 #ifdef SMP
 	printf("#define\tP_ONCPU %#x\n", OS(proc, p_oncpu));
 	printf("#define\tP_LASTCPU %#x\n", OS(proc, p_lastcpu));
@@ -140,14 +133,6 @@ main()
 	printf("#define\tPCB_MPNEST %#x\n", OS(pcb, pcb_mpnest));
 #endif
 	printf("#define\tPCB_SPARE %#x\n", OS(pcb, __pcb_spare));
-	printf("#define\tU_PROF %#x\n", OS(user, u_stats.p_prof));
-	printf("#define\tU_PROFSCALE %#x\n",
-	    OS(user, u_stats.p_prof.pr_scale));
-	printf("#define\tPR_BASE %#x\n", OS(uprof, pr_base));
-	printf("#define\tPR_SIZE %#x\n", OS(uprof, pr_size));
-	printf("#define\tPR_OFF %#x\n", OS(uprof, pr_off));
-	printf("#define\tPR_SCALE %#x\n", OS(uprof, pr_scale));
-	printf("#define\tRU_MINFLT %#x\n", OS(rusage, ru_minflt));
 	printf("#define\tPCB_FLAGS %#x\n", OS(pcb, pcb_flags));
 	printf("#define\tPCB_SAVEFPU %#x\n", OS(pcb, pcb_savefpu));
 	printf("#define\tPCB_SAVEFPU_SIZE %u\n", sizeof(struct save87));
@@ -156,23 +141,10 @@ main()
 	printf("#define\tPCB_SIZE %u\n", sizeof(struct pcb));
 #endif
 
-	printf("#define\tTF_ES %#x\n", OS(trapframe, tf_es));
-	printf("#define\tTF_DS %#x\n", OS(trapframe, tf_ds));
-	printf("#define\tTF_EDI %#x\n", OS(trapframe, tf_edi));
-	printf("#define\tTF_ESI %#x\n", OS(trapframe, tf_esi));
-	printf("#define\tTF_EBP %#x\n", OS(trapframe, tf_ebp));
-	printf("#define\tTF_ISP %#x\n", OS(trapframe, tf_isp));
-	printf("#define\tTF_EBX %#x\n", OS(trapframe, tf_ebx));
-	printf("#define\tTF_EDX %#x\n", OS(trapframe, tf_edx));
-	printf("#define\tTF_ECX %#x\n", OS(trapframe, tf_ecx));
-	printf("#define\tTF_EAX %#x\n", OS(trapframe, tf_eax));
 	printf("#define\tTF_TRAPNO %#x\n", OS(trapframe, tf_trapno));
 	printf("#define\tTF_ERR %#x\n", OS(trapframe, tf_err));
-	printf("#define\tTF_EIP %#x\n", OS(trapframe, tf_eip));
 	printf("#define\tTF_CS %#x\n", OS(trapframe, tf_cs));
 	printf("#define\tTF_EFLAGS %#x\n", OS(trapframe, tf_eflags));
-	printf("#define\tTF_ESP %#x\n", OS(trapframe, tf_esp));
-	printf("#define\tTF_SS %#x\n", OS(trapframe, tf_ss));
 
 	printf("#define\tSIGF_HANDLER %#x\n", OS(sigframe, sf_ahu.sf_handler));
 	printf("#define\tSIGF_SC %#x\n", OS(sigframe, sf_siginfo.si_sc));
@@ -193,8 +165,6 @@ main()
 	printf("#define\tBI_SYMTAB %#x\n", OS(bootinfo, bi_symtab));
 	printf("#define\tBI_ESYMTAB %#x\n", OS(bootinfo, bi_esymtab));
 	printf("#define\tBI_KERNEND %#x\n", OS(bootinfo, bi_kernend));
-	printf("#define\tBI_ENVP %#x\n", OS(bootinfo, bi_envp));
-	printf("#define\tBI_MODULEP %#x\n", OS(bootinfo, bi_modulep));
 
 	printf("#define\tGD_SIZEOF %u\n", sizeof(struct globaldata));
 	printf("#define\tGD_CURPROC %#x\n", OS(globaldata, gd_curproc));
@@ -222,7 +192,6 @@ main()
 	printf("#define\tGD_PRV_CADDR2 %#x\n", OS(globaldata, gd_prv_CADDR2));
 	printf("#define\tGD_PRV_CADDR3 %#x\n", OS(globaldata, gd_prv_CADDR3));
 	printf("#define\tGD_PRV_PADDR1 %#x\n", OS(globaldata, gd_prv_PADDR1));
-	printf("#define\tPS_GLOBALDATA %#x\n", OS(privatespace, globaldata));
 	printf("#define\tPS_IDLESTACK %#x\n", OS(privatespace, idlestack));
 	printf("#define\tPS_IDLESTACK_TOP %#x\n", sizeof(struct privatespace));
 #endif
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index d541e7a..9f17b0c 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.74 1999/07/29 07:10:35 msmith Exp $
+ *	$Id: genassym.c,v 1.75 1999/07/29 08:33:00 peter Exp $
  */
 
 #include "opt_user_ldt.h"
@@ -81,19 +81,12 @@ int
 main()
 {
 
-	printf("#define\tP_FORW %#x\n", OS(proc, p_procq.tqe_next));
-	printf("#define\tP_BACK %#x\n", OS(proc, p_procq.tqe_prev));
 	printf("#define\tP_VMSPACE %#x\n", OS(proc, p_vmspace));
 	printf("#define\tVM_PMAP %#x\n", OS(vmspace, vm_pmap));
 	printf("#define\tPM_ACTIVE %#x\n", OS(pmap, pm_active));
 	printf("#define\tP_ADDR %#x\n", OS(proc, p_addr));
-	printf("#define\tP_PRI %#x\n", OS(proc, p_priority));
-	printf("#define\tP_RTPRIO_TYPE %#x\n", OS(proc, p_rtprio.type));
-	printf("#define\tP_RTPRIO_PRIO %#x\n", OS(proc, p_rtprio.prio));
 	printf("#define\tP_STAT %#x\n", OS(proc, p_stat));
 	printf("#define\tP_WCHAN %#x\n", OS(proc, p_wchan));
-	printf("#define\tP_FLAG %#x\n", OS(proc, p_flag));
-	printf("#define\tP_PID %#x\n", OS(proc, p_pid));
 #ifdef SMP
 	printf("#define\tP_ONCPU %#x\n", OS(proc, p_oncpu));
 	printf("#define\tP_LASTCPU %#x\n", OS(proc, p_lastcpu));
@@ -140,14 +133,6 @@ main()
 	printf("#define\tPCB_MPNEST %#x\n", OS(pcb, pcb_mpnest));
 #endif
 	printf("#define\tPCB_SPARE %#x\n", OS(pcb, __pcb_spare));
-	printf("#define\tU_PROF %#x\n", OS(user, u_stats.p_prof));
-	printf("#define\tU_PROFSCALE %#x\n",
-	    OS(user, u_stats.p_prof.pr_scale));
-	printf("#define\tPR_BASE %#x\n", OS(uprof, pr_base));
-	printf("#define\tPR_SIZE %#x\n", OS(uprof, pr_size));
-	printf("#define\tPR_OFF %#x\n", OS(uprof, pr_off));
-	printf("#define\tPR_SCALE %#x\n", OS(uprof, pr_scale));
-	printf("#define\tRU_MINFLT %#x\n", OS(rusage, ru_minflt));
 	printf("#define\tPCB_FLAGS %#x\n", OS(pcb, pcb_flags));
 	printf("#define\tPCB_SAVEFPU %#x\n", OS(pcb, pcb_savefpu));
 	printf("#define\tPCB_SAVEFPU_SIZE %u\n", sizeof(struct save87));
@@ -156,23 +141,10 @@ main()
 	printf("#define\tPCB_SIZE %u\n", sizeof(struct pcb));
 #endif
 
-	printf("#define\tTF_ES %#x\n", OS(trapframe, tf_es));
-	printf("#define\tTF_DS %#x\n", OS(trapframe, tf_ds));
-	printf("#define\tTF_EDI %#x\n", OS(trapframe, tf_edi));
-	printf("#define\tTF_ESI %#x\n", OS(trapframe, tf_esi));
-	printf("#define\tTF_EBP %#x\n", OS(trapframe, tf_ebp));
-	printf("#define\tTF_ISP %#x\n", OS(trapframe, tf_isp));
-	printf("#define\tTF_EBX %#x\n", OS(trapframe, tf_ebx));
-	printf("#define\tTF_EDX %#x\n", OS(trapframe, tf_edx));
-	printf("#define\tTF_ECX %#x\n", OS(trapframe, tf_ecx));
-	printf("#define\tTF_EAX %#x\n", OS(trapframe, tf_eax));
 	printf("#define\tTF_TRAPNO %#x\n", OS(trapframe, tf_trapno));
 	printf("#define\tTF_ERR %#x\n", OS(trapframe, tf_err));
-	printf("#define\tTF_EIP %#x\n", OS(trapframe, tf_eip));
 	printf("#define\tTF_CS %#x\n", OS(trapframe, tf_cs));
 	printf("#define\tTF_EFLAGS %#x\n", OS(trapframe, tf_eflags));
-	printf("#define\tTF_ESP %#x\n", OS(trapframe, tf_esp));
-	printf("#define\tTF_SS %#x\n", OS(trapframe, tf_ss));
 
 	printf("#define\tSIGF_HANDLER %#x\n", OS(sigframe, sf_ahu.sf_handler));
 	printf("#define\tSIGF_SC %#x\n", OS(sigframe, sf_siginfo.si_sc));
@@ -193,8 +165,6 @@ main()
 	printf("#define\tBI_SYMTAB %#x\n", OS(bootinfo, bi_symtab));
 	printf("#define\tBI_ESYMTAB %#x\n", OS(bootinfo, bi_esymtab));
 	printf("#define\tBI_KERNEND %#x\n", OS(bootinfo, bi_kernend));
-	printf("#define\tBI_ENVP %#x\n", OS(bootinfo, bi_envp));
-	printf("#define\tBI_MODULEP %#x\n", OS(bootinfo, bi_modulep));
 
 	printf("#define\tGD_SIZEOF %u\n", sizeof(struct globaldata));
 	printf("#define\tGD_CURPROC %#x\n", OS(globaldata, gd_curproc));
@@ -222,7 +192,6 @@ main()
 	printf("#define\tGD_PRV_CADDR2 %#x\n", OS(globaldata, gd_prv_CADDR2));
 	printf("#define\tGD_PRV_CADDR3 %#x\n", OS(globaldata, gd_prv_CADDR3));
 	printf("#define\tGD_PRV_PADDR1 %#x\n", OS(globaldata, gd_prv_PADDR1));
-	printf("#define\tPS_GLOBALDATA %#x\n", OS(privatespace, globaldata));
 	printf("#define\tPS_IDLESTACK %#x\n", OS(privatespace, idlestack));
 	printf("#define\tPS_IDLESTACK_TOP %#x\n", sizeof(struct privatespace));
 #endif
diff --git a/sys/i386/include/asnames.h b/sys/i386/include/asnames.h
index 8d1b478..89218ab 100644
--- a/sys/i386/include/asnames.h
+++ b/sys/i386/include/asnames.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: asnames.h,v 1.37 1999/07/20 06:52:33 msmith Exp $
+ * $Id: asnames.h,v 1.38 1999/07/29 01:49:19 msmith Exp $
  */
 
 #ifndef _MACHINE_ASNAMES_H_
@@ -128,9 +128,7 @@
 #define _Xintr6				Xintr6
 #define _Xintr7				Xintr7
 #define _Xintr8				Xintr8
-#define _Xintr8254			Xintr8254
 #define _Xintr9				Xintr9
-#define _XintrRTC			XintrRTC
 #define _Xinvltlb			Xinvltlb
 #define _Xrendezvous			Xrendezvous
 #define _Xmchk				Xmchk
@@ -149,27 +147,9 @@
 #define __udatasel			_udatasel
 #define _alltraps			alltraps
 #define _ap_init			ap_init
-#define _apic_base			apic_base
-#define _apic_id_to_logical		apic_id_to_logical
 #define _apic_imen			apic_imen
 #define _apic_isrbit_location		apic_isrbit_location
 #define _apic_pin_trigger		apic_pin_trigger
-#define _apm_addr			apm_addr
-#define _apm_bios_call			apm_bios_call
-#define _apm_cs16_base			apm_cs16_base
-#define _apm_cs16_limit			apm_cs16_limit
-#define _apm_cs32_base			apm_cs32_base
-#define _apm_cs32_limit			apm_cs32_limit
-#define _apm_cs_entry			apm_cs_entry
-#define _apm_cs_limit			apm_cs_limit
-#define _apm_current_gdt_pdesc		apm_current_gdt_pdesc
-#define _apm_ds_base			apm_ds_base
-#define _apm_ds_limit			apm_ds_limit
-#define _apm_flags			apm_flags
-#define _apm_init_image			apm_init_image
-#define _apm_init_image_size		apm_init_image_size
-#define _apm_setup			apm_setup
-#define _apm_version			apm_version
 #define _arith_invalid			arith_invalid
 #define _arith_overflow			arith_overflow
 #define _arith_underflow		arith_underflow
@@ -180,7 +160,6 @@
 #define _bintr				bintr
 #define _bio_imask			bio_imask
 #define _bioscall_vector		bioscall_vector
-#define _bluetrap			bluetrap
 #define _bootCodeSeg			bootCodeSeg
 #define _bootDataSeg			bootDataSeg
 #define _bootMP				bootMP
@@ -190,7 +169,6 @@
 #define _bootdev			bootdev
 #define _boothowto			boothowto
 #define _bootinfo			bootinfo
-#define _bootstrap_gdt			bootstrap_gdt
 #define _btrap				btrap
 #define _bzero				bzero
 #define _cam_imask			cam_imask
@@ -201,7 +179,7 @@
 #define _checkstate_pc			checkstate_pc
 #define _checkstate_pending_ast		checkstate_pending_ast
 #define _checkstate_probed_cpus		checkstate_probed_cpus
-#define _clock_lock			clock_lock
+#define _chooseproc			chooseproc
 #define _cnt				cnt
 #define _copyin_vector			copyin_vector
 #define _copyout_vector			copyout_vector
@@ -217,7 +195,6 @@
 #define _cpu_num_to_apic_id		cpu_num_to_apic_id
 #define _cpu_switch			cpu_switch
 #define _cpu_vendor			cpu_vendor
-#define _cypoll				cypoll
 #define _default_halt			default_halt
 #define _denormal_operand		denormal_operand
 #define _div_small			div_small
@@ -244,16 +221,13 @@
 #define _get_isrlock			get_isrlock
 #define _get_mplock			get_mplock
 #define _get_syscall_lock		get_syscall_lock
-#define _getmicrouptime			getmicrouptime
 #define _idle				idle
-#define _idqs				idqs
 #define _ihandlers			ihandlers
 #define _imen				imen
 #define _imen_lock			imen_lock
 #define _in_vm86call			in_vm86call
 #define _init386			init386
 #define _init_secondary			init_secondary
-#define _initial_bioscalls		initial_bioscalls
 #define _intr_countp			intr_countp
 #define _intr_handler			intr_handler
 #define _intr_mask			intr_mask
@@ -265,14 +239,10 @@
 #define _ioapic				ioapic
 #define _ipending			ipending
 #define _isr_lock			isr_lock
-#define _ivectors			ivectors
 #define _kernelname			kernelname
-#define _kstack				kstack
 #define _lapic				lapic
 #define _linux_sigcode			linux_sigcode
 #define _linux_szsigcode		linux_szsigcode
-#define _mask8254			mask8254
-#define _maskRTC			maskRTC
 #define _mi_startup			mi_startup
 #define _microuptime			microuptime
 #define _mp_gdtbase			mp_gdtbase
@@ -286,8 +256,6 @@
 #define _nfs_diskless_valid		nfs_diskless_valid
 #define _normalize			normalize
 #define _normalize_nuo			normalize_nuo
-#define _npx_intrs_while_probing	npx_intrs_while_probing
-#define _npx_traps_while_probing	npx_traps_while_probing
 #define _npx_intr			npx_intr
 #define _npxsave			npxsave
 #define _ovbcopy_vector			ovbcopy_vector
@@ -298,12 +266,9 @@
 #define _poly_div4			poly_div4
 #define _polynomial			polynomial
 #define _private_tss			private_tss
-#define _probeintr			probeintr
-#define _probetrap			probetrap
 #define _proc0				proc0
 #define _proc0paddr			proc0paddr
-#define _qs				qs
-#define _rcpoll				rcpoll
+#define _procrunnable			procrunnable
 #define _real_2op_NaN			real_2op_NaN
 #define _reg_div			reg_div
 #define _reg_u_add			reg_u_add
@@ -312,17 +277,14 @@
 #define _reg_u_sub			reg_u_sub
 #define _rel_mplock			rel_mplock
 #define _round_reg			round_reg
-#define _rtqs				rtqs
 #define _s_lock				s_lock
 #define _s_unlock			s_unlock
-#define _secondary_main			secondary_main
 #define _set_precision_flag_down	set_precision_flag_down
 #define _set_precision_flag_up		set_precision_flag_up
 #define _set_user_ldt			set_user_ldt
 #define _shrx				shrx
 #define _shrxs				shrxs
 #define _sigcode			sigcode
-#define _siopoll			siopoll
 #define _smp_active			smp_active
 #define _soft_imask			soft_imask
 #define _softclock			softclock
@@ -345,32 +307,17 @@
 #define _szsigcode			szsigcode
 #define _ticks				ticks
 #define _time				time
-#define _timer0_max_count		timer0_max_count
-#define _timer0_overflow_threshold	timer0_overflow_threshold
-#define _timer0_prescaler_count		timer0_prescaler_count
 #define _trap				trap
-#define _trap_by_wrmsr			trap_by_wrmsr
 #define _trapwrite			trapwrite
-#define _tsc_bias			tsc_bias
-#define _tsc_freq			tsc_freq
-#define _tsc_multiplier			tsc_multiplier
 #define _tty_imask			tty_imask
-#define _userconfig_from_boot		userconfig_from_boot
 #define _vec				vec
 #define _vec8254			vec8254
-#define _vecRTC				vecRTC
-#define _vm86_emulate			vm86_emulate
 #define _vm86_prepcall			vm86_prepcall
-#define _vm86_sysarch			vm86_sysarch
-#define _vm86_trap			vm86_trap
 #define _vm86pa				vm86pa
 #define _vm86paddr			vm86paddr
 #define _vm86pcb			vm86pcb
 #define _vm_page_zero_idle		vm_page_zero_idle
 #define _want_resched			want_resched
-#define _whichidqs			whichidqs
-#define _whichqs			whichqs
-#define _whichrtqs			whichrtqs
 #define _wm_sqrt			wm_sqrt
 
 #endif /* __ELF__ */
diff --git a/sys/powerpc/powerpc/genassym.c b/sys/powerpc/powerpc/genassym.c
index aeb6483..945f537 100644
--- a/sys/powerpc/powerpc/genassym.c
+++ b/sys/powerpc/powerpc/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.6 1999/06/26 12:45:12 peter Exp $
+ *	$Id: genassym.c,v 1.7 1999/06/28 09:15:35 peter Exp $
  */
 
 #include <sys/param.h>
@@ -78,18 +78,7 @@ int	printf __P((const char *, ...));
 int
 main()
 {
-	OFF(P_FORW,		struct proc,	p_procq.tqe_next);
-	OFF(P_BACK,		struct proc,	p_procq.tqe_prev);
-	OFF(P_VMSPACE,		struct proc,	p_vmspace);
 	OFF(P_ADDR,		struct proc,	p_addr);
-	OFF(P_PRI,		struct proc,	p_priority);
-	OFF(P_RTPRIO_TYPE,	struct proc,	p_rtprio.type);
-	OFF(P_RTPRIO_PRIO,	struct proc,	p_rtprio.prio);
-	OFF(P_STAT,		struct proc,	p_stat);
-	OFF(P_WCHAN,		struct proc,	p_wchan);
-	OFF(P_FLAG,		struct proc,	p_flag);
-	OFF(P_PID,		struct proc,	p_pid);
-	OFF(P_RUNTIME,		struct proc,	p_runtime);
 	OFF(P_MD_FLAGS,		struct proc,	p_md.md_flags);
 	OFF(P_MD_PCBPADDR,	struct proc,	p_md.md_pcbpaddr);
 	OFF(P_MD_HAE,		struct proc,	p_md.md_hae);
@@ -97,53 +86,21 @@ main()
 
 	OFF(CHIPSET_WRITE_HAE,	struct alpha_chipset, write_hae);
 
-	OFF(PH_LINK,		struct prochd,	ph_link);
-	OFF(PH_RLINK,		struct prochd,	ph_rlink);
-
-	CONST1(SSLEEP);
-	CONST1(SRUN);
-
-	OFF(VM_PMAP,		struct vmspace,	vm_pmap);
-	OFF(V_TRAP,		struct vmmeter,	v_trap);
-	OFF(V_SYSCALL,		struct vmmeter,	v_trap);
-	OFF(V_INTR,		struct vmmeter,	v_trap);
-
-	CONST1(UPAGES);
-	CONST1(PAGE_SIZE);
-	CONST1(PAGE_SHIFT);
-	CONST1(PAGE_MASK);
-	CONST1(USRSTACK);
 	CONST1(VM_MAXUSER_ADDRESS);
-	CONST1(KERNBASE);
 	CONST1(PTLEV1I);
 	CONST1(PTESIZE);
 
 	OFF(U_PCB_ONFAULT,	struct user,	u_pcb.pcb_onfault);
 	OFF(U_PCB_HWPCB_KSP,	struct user,	u_pcb.pcb_hw.apcb_ksp);
 	OFF(U_PCB_CONTEXT,	struct user,	u_pcb.pcb_context);
-	OFF(U_PROFSCALE,	struct user,	u_stats.p_prof.pr_scale);
-
-	OFF(PR_BASE,		struct uprof,	pr_base);
-	OFF(PR_SIZE,		struct uprof,	pr_size);
-	OFF(PR_OFF,		struct uprof,	pr_off);
-	OFF(PR_SCALE,		struct uprof,	pr_scale);
 
-	OFF(RU_MINFLT,		struct rusage,	ru_minflt);
-	
 	OFF(PCB_HW,		struct pcb,	pcb_hw);
-	OFF(PCB_CONTEXT,	struct pcb,	pcb_context);
-	OFF(PCB_FP,		struct pcb,	pcb_fp);
-	OFF(PCB_ONFAULT,	struct pcb,	pcb_onfault);
-	OFF(PCB_ACCESSADDR,	struct pcb,	pcb_accessaddr);
 
 	OFF(FPREG_FPR_REGS,	struct fpreg,	fpr_regs);
 	OFF(FPREG_FPR_CR,	struct fpreg,	fpr_cr);
 
-	CONST1(B_READ);
-	CONST1(ENOENT);
 	CONST1(EFAULT);
 	CONST1(ENAMETOOLONG);
-	CONST1(MAXPATHLEN);
 
 	/* Register offsets, for stack frames. */
 	CONST1(FRAME_V0),