kernel: The COMPAT_DF12 kernel option is pc32 specific.
authorSascha Wildner <saw@online.de>
Thu, 3 Jan 2013 16:46:42 +0000 (17:46 +0100)
committerSascha Wildner <saw@online.de>
Thu, 3 Jan 2013 16:46:42 +0000 (17:46 +0100)
sys/conf/options
sys/config/VKERNEL64
sys/kern/init_sysent.c
sys/kern/makesyscalls.sh
sys/platform/pc32/conf/options
sys/platform/vkernel64/conf/files

index f9796ab..0f3c367 100644 (file)
@@ -74,7 +74,6 @@ ACPI_NO_SEMAPHORES    opt_acpi.h
 ACPI_ENABLE_PCI                opt_acpi.h
 
 # Miscellaneous options.
-COMPAT_DF12    opt_compatdf12.h
 COMPAT_43      opt_compat.h
 COMPAT_SUNOS   opt_compat.h
 COMPILING_LINT opt_lint.h
index 19ec0e2..2b8c036 100644 (file)
@@ -54,7 +54,6 @@ options       MSDOSFS                 #MSDOS Filesystem
 options        CD9660                  #ISO 9660 Filesystem
 options        PROCFS                  #Process filesystem
 #options       COMPAT_43               #Compatible with BSD 4.3
-#options       COMPAT_DF12             #Compatible with DragonFly 1.2 and earlier
 options        UCONSOLE                #Allow users to grab the console
 options        KTRACE                  #ktrace(1) support
 options        SYSVSHM                 #SYSV-style shared memory
index 20563bb..61ebdf1 100644 (file)
@@ -7,7 +7,9 @@
 
 #include "opt_compat.h"
 
+#ifdef __i386__
 #include "opt_compatdf12.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/sysent.h>
index f291d6c..121a842 100644 (file)
@@ -499,7 +499,9 @@ s/\$//g
                }
 
                if (ncompatdf12 != 0) {
-                       printf "#include \"opt_compatdf12.h\"\n\n" > syssw
+                       printf "#ifdef __i386__\n" > syssw
+                       printf "#include \"opt_compatdf12.h\"\n" > syssw
+                       printf "#endif\n\n" > syssw
                        printf "\n#ifdef %s\n", compatdf12 > sysinc
                        printf "#define compatdf12(n, name) n, (sy_call_t *)__CONCAT(sys_,__CONCAT(dfbsd12_,name))\n" > sysinc
                        printf "#else\n" > sysinc
index 63533bd..f280480 100644 (file)
@@ -22,6 +22,8 @@ COMPAT_LINUX          opt_dontuse.h
 LINPROCFS              opt_dontuse.h   #Linux compatible procfs
 NDISAPI                        opt_dontuse.h
 
+COMPAT_DF12            opt_compatdf12.h
+
 # i386 SMP options
 
 # Change KVM size.  Changes things all over the kernel.
index e6b7e42..65d7593 100644 (file)
@@ -1,8 +1,6 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $DragonFly: src/sys/platform/vkernel/conf/files,v 1.21 2008/03/20 02:14:52 dillon Exp $
-#
 crypto/blowfish/bf_enc.c               optional        ipsec ipsec_esp
 crypto/des/des_enc.c                   optional        ipsec ipsec_esp
 crypto/des/des_ecb.c                   optional        netsmbcrypto
@@ -12,8 +10,6 @@ crypto/blowfish/bf_enc.c              optional        crypto
 crypto/des/des_enc.c                   optional        crypto
 crypto/des/des_ecb.c                   optional        crypto
 crypto/des/des_setkey.c                        optional        crypto
-emulation/dragonfly12/dfbsd12_getdirentries.c  optional        compat_df12
-emulation/dragonfly12/dfbsd12_stat.c           optional        compat_df12
 kern/link_elf_obj.c            standard
 vfs/smbfs/smbfs_io.c           optional        smbfs
 vfs/smbfs/smbfs_node.c         optional        smbfs