From: Sascha Wildner <saw@online.de>
Date: Thu, 3 Jan 2013 16:46:42 +0000 (+0100)
Subject: kernel: The COMPAT_DF12 kernel option is pc32 specific.
X-Git-Tag: v3.4.0rc~562
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/68336437191890d72fb339ecbccc9e34da1f38be

kernel: The COMPAT_DF12 kernel option is pc32 specific.
---

diff --git a/sys/conf/options b/sys/conf/options
index f9796abbfc..0f3c36733a 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -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
diff --git a/sys/config/VKERNEL64 b/sys/config/VKERNEL64
index 19ec0e2776..2b8c036ef5 100644
--- a/sys/config/VKERNEL64
+++ b/sys/config/VKERNEL64
@@ -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
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 20563bbb57..61ebdf1484 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -7,7 +7,9 @@
 
 #include "opt_compat.h"
 
+#ifdef __i386__
 #include "opt_compatdf12.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/sysent.h>
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index f291d6ce1b..121a842a0a 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -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
diff --git a/sys/platform/pc32/conf/options b/sys/platform/pc32/conf/options
index 63533bd041..f2804808a9 100644
--- a/sys/platform/pc32/conf/options
+++ b/sys/platform/pc32/conf/options
@@ -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.
diff --git a/sys/platform/vkernel64/conf/files b/sys/platform/vkernel64/conf/files
index e6b7e42b35..65d75933fd 100644
--- a/sys/platform/vkernel64/conf/files
+++ b/sys/platform/vkernel64/conf/files
@@ -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