PERFORCE change 118889 for review

[Roman Divacky]

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

Change 118889 by rdivacky at rdivacky_witten on 2007/04/27 19:59:31

	Fix the module building.

Affected files ...

.. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/linux/linux_support.s#2 edit
.. //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/linux/Makefile#3 edit

Differences ...

==== //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/linux/linux_support.s#2 (text+ko) ====

@@ -32,116 +32,7 @@
 #include "linux_assym.h"                        /* system definitions */
 #include <machine/asmacros.h>                   /* miscellaneous asm macros */
 
-//#include "assym.s"
-
-#define	BC32SEL	0x68
-#define	BI_ENDCOMMON	0xc
-#define	BI_ESYMTAB	0x44
-#define	BI_KERNELNAME	0x4
-#define	BI_KERNEND	0x48
-#define	BI_NFS_DISKLESS	0x8
-#define	BI_SIZE	0x30
-#define	BI_SYMTAB	0x40
-#define	BI_VERSION	0x0
-#define	BOOTINFO_SIZE	0x54
-#define	EFAULT	0xe
-#define	ENAMETOOLONG	0x3f
-#define	ENOENT	0x2
-#define	GPROC0_SEL	0x9
-#define	KCSEL	0x20
-#define	KDSEL	0x28
-#define	KERNBASE	0xc0000000
-#define	KERNLOAD	0x400000
-#define	KPSEL	0x8
-#define	KSTACK_PAGES	0x2
-#define	MAXCOMLEN	0x13
-#define	MAXPATHLEN	0x400
-#define	MCLBYTES	0x800
-#define	MD_LDT	0x0
-#define	MTX_LOCK	0x10
-#define	MTX_RECURSECNT	0x14
-#define	NFSDISKLESS_SIZE	0x220
-#define	NPDEPG	0x400
-#define	NPDEPTD	0x400
-#define	NPGPTD	0x1
-#define	NPTEPG	0x400
-#define	PAGE_MASK	0xfff
-#define	PAGE_SHIFT	0xc
-#define	PAGE_SIZE	0x1000
-#define	PCB_CR3	0x0
-#define	PCB_DBREGS	0x2
-#define	PCB_DR0	0x1c
-#define	PCB_DR1	0x20
-#define	PCB_DR2	0x24
-#define	PCB_DR3	0x28
-#define	PCB_DR6	0x2c
-#define	PCB_DR7	0x30
-#define	PCB_EBP	0xc
-#define	PCB_EBX	0x14
-#define	PCB_EDI	0x4
-#define	PCB_EIP	0x18
-#define	PCB_ESI	0x8
-#define	PCB_ESP	0x10
-#define	PCB_EXT	0x25c
-#define	PCB_FLAGS	0x240
-#define	PCB_FSD	0x24c
-#define	PCB_GS	0x248
-#define	PCB_ONFAULT	0x244
-#define	PCB_PSL	0x260
-#define	PCB_SAVEFPU_SIZE	0x200
-#define	PCB_SAVEFPU	0x40
-#define	PCB_SIZE	0x270
-#define	PCB_VM86CALL	0x10
-#define	PCB_VM86	0x264
-#define	PC_COMMON_TSSD	0xa4
-#define	PC_COMMON_TSS	0x3c
-#define	PC_CPUID	0x20
-#define	PC_CURPCB	0x10
-#define	PC_CURPMAP	0x38
-#define	PC_CURRENTLDT	0xb4
-#define	PC_CURTHREAD	0x0
-#define	PC_CURTID	0x18c
-#define	PC_FPCURTHREAD	0x8
-#define	PC_FSGS_GDT	0xb0
-#define	PC_IDLETHREAD	0x4
-#define	PC_PRIVATE_TSS	0xc0
-#define	PC_PRVSPACE	0x34
-#define	PC_SIZEOF	0x190
-#define	PC_TSS_GDT	0xac
-#define	PDESHIFT	0x2
-#define	PDESIZE	0x4
-#define	PDRMASK	0x3fffff
-#define	PDRSHIFT	0x16
-#define	PM_ACTIVE	0x24
-#define	PTESHIFT	0x2
-#define	PTESIZE	0x4
-#define	P_MD	0x1f4
-#define	P_SFLAG	0x34
-#define	P_VMSPACE	0xb0
-#define	SIGF_HANDLER	0x10
-#define	SIGF_UC	0x20
-#define	TDF_ASTPENDING	0x800
-#define	TDF_NEEDRESCHED	0x10000
-#define	TD_FLAGS	0x64
-#define	TD_MD	0x17c
-#define	TD_PCB	0x130
-#define	TD_PROC	0x0
-#define	TD_TID	0x30
-#define	TF_CS	0x38
-#define	TF_EFLAGS	0x3c
-#define	TF_EIP	0x34
-#define	TF_ERR	0x30
-#define	TF_TRAPNO	0x2c
-#define	TSS_ESP0	0x4
-#define	UC_EFLAGS	0x54
-#define	UC_GS	0x14
-#define	USRSTACK	0xbfc00000
-#define	VM86_FRAMESIZE	0x58
-#define	VM_MAXUSER_ADDRESS	0xbfc00000
-#define	VM_PMAP	0x8c
-#define	V_INTR	0xc
-#define	V_SYSCALL	0x8
-#define	V_TRAP	0x4
+#include "assym.s"
 
 /*****************************************************************************/
 /* linux_futex support                                                       */

==== //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/linux/Makefile#3 (text+ko) ====

@@ -14,7 +14,11 @@
 	linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \
 	linux${SFX}_sysvec.c linux_uid16.c linux_util.c linux_time.c \
 	opt_inet6.h opt_mac.h opt_compat.h opt_posix.h vnode_if.h \
-	device_if.h bus_if.h
+	device_if.h bus_if.h assym.s
+
+# XXX: for assym.s
+SRCS+=  opt_kstack_pages.h opt_nfs.h opt_apic.h opt_compat.h
+
 OBJS=	linux${SFX}_locore.o linux${SFX}_support.o
 
 .if ${MACHINE_ARCH} == "i386"