From aed8549e91ade1582505ebce50e4a79d99b4436f Mon Sep 17 00:00:00 2001
From: Rik Faith <faith@alephnull.com>
Date: Wed, 19 Jul 2000 18:38:41 +0000
Subject: Sync with Linux 2.4.0-test4 kernel

---
 linux/init.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'linux/init.c')

diff --git a/linux/init.c b/linux/init.c
index aefc884e..8de3dac9 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;
 }
-- 
cgit v1.2.3