Merge trunk into tdfx-2-1-branchtdfx-2-1-20000906

1 files changed, 7 insertions, 0 deletions

diff --git a/linux/init.c b/linux/init.c
index aefc884eb..8de3dac9b 100644
--- a/linux/init.c
+++ b/linux/init.c
@@ -97,10 +97,17 @@ void drm_parse_options(char *s)
 	}
 }
 
+/* drm_cpu_valid returns non-zero if the DRI will run on this CPU, and 0
+ * otherwise. */
+
 int drm_cpu_valid(void)
 {
 #if defined(__i386__)
 	if (boot_cpu_data.x86 == 3) return 0; /* No cmpxchg on a 386 */
 #endif
+#if defined(__sparc__) && !defined(__sparc_v9__)
+	if (1)
+		return 0; /* No cmpxchg before v9 sparc. */
+#endif
 	return 1;
 }