Index: apic_vector.s
===================================================================
RCS file: /home/ncvs/src/sys/i386/i386/apic_vector.s,v
retrieving revision 1.97
diff -u -r1.97 apic_vector.s
--- apic_vector.s	3 Feb 2004 22:00:41 -0000	1.97
+++ apic_vector.s	8 Apr 2004 18:58:31 -0000
@@ -336,7 +336,7 @@
 	call	CNAME(savectx)		/* Save process context */
 	addl	$4, %esp
 		
-	movl	PCPU(CPUID), %eax
+	movl	PCPU(CPUMASK), %eax
 
 	lock
 	btsl	%eax, CNAME(stopped_cpus) /* stopped_cpus |= (1<<id) */
Index: genassym.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/i386/genassym.c,v
retrieving revision 1.146
diff -u -r1.146 genassym.c
--- genassym.c	12 Nov 2003 18:14:34 -0000	1.146
+++ genassym.c	8 Apr 2004 18:58:19 -0000
@@ -200,6 +200,7 @@
 ASSYM(PC_TSS_GDT, offsetof(struct pcpu, pc_tss_gdt));
 ASSYM(PC_CURRENTLDT, offsetof(struct pcpu, pc_currentldt));
 ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid));
+ASSYM(PC_CPUMASK, offsetof(struct pcpu, pc_cpumask));
 ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap));
 
 #ifdef DEV_APIC