PERFORCE change 37962 for review

[Peter Wemm]

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

Change 37962 by peter at peter_hammer on 2003/09/12 10:25:51

	Tweaks to survive 'make depend'

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#13 edit
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#4 edit
.. //depot/projects/hammer/sys/amd64/amd64/mpboot.s#4 edit
.. //depot/projects/hammer/sys/amd64/amd64/nexus.c#12 edit
.. //depot/projects/hammer/sys/amd64/include/pcpu.h#10 edit
.. //depot/projects/hammer/sys/amd64/isa/atpic_vector.s#2 edit
.. //depot/projects/hammer/sys/amd64/isa/npx.c#7 edit
.. //depot/projects/hammer/sys/conf/files.amd64#23 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#13 (text+ko) ====

@@ -60,7 +60,7 @@
 #include <machine/md_var.h>
 
 #include <amd64/isa/icu.h>
-#include <amd64/isa/intr_machdep.h>
+#include <amd64/include/intr_machdep.h>
 
 /* XXX - should be in header file: */
 void printcpuinfo(void);

==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#4 (text+ko) ====

@@ -26,7 +26,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.216 2003/09/10 01:36:48 jhb Exp $");
 
-#include "opt_apic.h"
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
 
@@ -34,10 +33,6 @@
 #if !defined(SMP)
 #error How did you get here?
 #endif
-
-#ifndef DEV_APIC
-#error The apic device is required for SMP, add "device apic" to your config file.
-#endif
 #endif /* not lint */
 
 #include <sys/param.h>

==== //depot/projects/hammer/sys/amd64/amd64/mpboot.s#4 (text+ko) ====

@@ -34,8 +34,6 @@
  * $FreeBSD: src/sys/i386/i386/mpboot.s,v 1.20 2003/03/30 05:24:52 jake Exp $
  */
 
-#include "opt_pmap.h"
-
 #include <machine/asmacros.h>		/* miscellaneous asm macros */
 #include <machine/apicreg.h>
 #include <machine/specialreg.h>

==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#12 (text+ko) ====

@@ -46,7 +46,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/intr_machdep.h>
+#include <machine/intr_machdep.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>

==== //depot/projects/hammer/sys/amd64/include/pcpu.h#10 (text+ko) ====

@@ -40,7 +40,8 @@
  */
 #define	PCPU_MD_FIELDS							\
 	struct	pcpu *pc_prvspace;	/* Self-reference */		\
-	register_t pc_scratch_rsp;	/* User %rsp in syscall */
+	struct	pmap *pc_curpmap;					\
+	register_t pc_scratch_rsp;	/* User %rsp in syscall */	\
 	u_int	pc_apic_id;
 
 #if defined(lint)

==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.s#2 (text+ko) ====

@@ -40,8 +40,6 @@
  * master and slave interrupt controllers.
  */
 
-#include "opt_auto_eoi.h"
-
 #include <machine/asmacros.h>
 #include <i386/isa/icu.h>
 #ifdef PC98

==== //depot/projects/hammer/sys/amd64/isa/npx.c#7 (text+ko) ====

@@ -69,7 +69,7 @@
 #include <machine/segments.h>
 #include <machine/ucontext.h>
 
-#include <amd64/isa/intr_machdep.h>
+#include <amd64/include/intr_machdep.h>
 #ifdef DEV_ISA
 #include <isa/isavar.h>
 #endif

==== //depot/projects/hammer/sys/conf/files.amd64#23 (text+ko) ====

@@ -8,13 +8,13 @@
 # dependency lines other than the first are silently ignored.
 #
 
-ia32_genassym.o			optional	ia32			\
+ia32_genassym.o			standard				\
 	dependency 	"$S/compat/ia32/ia32_genassym.c"		\
 	compile-with	"${CC} ${CFLAGS:N-fno-common} -c ${.IMPSRC}"	\
 	no-obj no-implicit-rule						\
 	clean		"ia32_genassym.o"
 #
-ia32_assym.h			optional	ia32			\
+ia32_assym.h			standard				\
 	dependency 	"$S/kern/genassym.sh ia32_genassym.o"		\
 	compile-with	"env NM=${NM} sh $S/kern/genassym.sh ia32_genassym.o > ${.TARGET}" \
 	no-obj no-implicit-rule before-depend				\
@@ -65,14 +65,12 @@
 amd64/amd64/exception.S		standard
 amd64/amd64/identcpu.c		standard
 amd64/amd64/initcpu.c		standard
-amd64/amd64/intr_machdep.c	standard
 amd64/amd64/io_apic.c		standard
 amd64/amd64/legacy.c		standard
 amd64/amd64/local_apic.c	standard
 amd64/amd64/locore.S		standard	no-obj
 amd64/amd64/machdep.c		standard
 amd64/amd64/mem.c		standard
-amd64/amd64/mp_clock.c		optional	smp
 amd64/amd64/mp_machdep.c	optional	smp
 amd64/amd64/mpboot.s		optional	smp
 amd64/amd64/mptable.c		standard