Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/include/types.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/include/types.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.67.4.3
retrieving revision 1.68
diff -u -p -r1.67.4.3 -r1.68
--- src/sys/arch/i386/include/types.h	2011/04/21 01:41:07	1.67.4.3
+++ src/sys/arch/i386/include/types.h	2010/09/21 00:18:05	1.68
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.67.4.3 2011/04/21 01:41:07 rmind Exp $	*/
+/*	$NetBSD: types.h,v 1.68 2010/09/21 00:18:05 jym Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -102,22 +102,17 @@ typedef	volatile unsigned char		__cpu_si
 #define	__NO_STRICT_ALIGNMENT
 
 #define	__HAVE_DEVICE_REGISTER
-#define	__HAVE_CPU_DATA_FIRST
 #define	__HAVE_CPU_COUNTER
 #define	__HAVE_MD_CPU_OFFLINE
 #define	__HAVE_SYSCALL_INTERN
 #define	__HAVE_MINIMAL_EMUL
 #define	__HAVE_OLD_DISKLABEL
-#define __HAVE_ATOMIC64_OPS
 #define	__HAVE_ATOMIC_AS_MEMBAR
 #define	__HAVE_CPU_LWP_SETPRIVATE
 #define	__HAVE_INTR_CONTROL
-#define	__HAVE_MM_MD_OPEN
-#define	__HAVE___LWP_GETPRIVATE_FAST
-#define	__HAVE_TLS_VARIANT_II
-#define	__HAVE_COMMON___TLS_GET_ADDR
 
 #if defined(_KERNEL)
+#define	__HAVE_ATOMIC64_OPS		/* not true for i486 in userspace */
 #define	__HAVE_RAS
 #endif