---

yaml --- r: 57080 b: refs/heads/master c: 5f81941 h: refs/heads/master v: v3
git-mirror · May 29, 2007 · d4b7398 · d4b7398
1 parent 6bb69d6
commit d4b7398
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6197fe4d720ea3e2ee94cdc7ef32d6c0151199de
+refs/heads/master: 5f81941c9d47f783e834028dcfb8548809da5a53
diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig
@@ -178,6 +178,13 @@ config ARCH_HAS_ILOG2_U64
 	bool
 	default n
 
+config EMULATED_CMPXCHG
+	bool
+	default y
+	help
+	  Sparc32 does not have a CAS instruction like sparc64. cmpxchg()
+	  is emulated, and therefore it is not completely atomic.
+
 config SUN_PM
 	bool
 	default y

diff --git a/trunk/drivers/char/drm/Kconfig b/trunk/drivers/char/drm/Kconfig
@@ -6,7 +6,7 @@
 #
 config DRM
 	tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
-	depends on (AGP || AGP=n) && PCI
+	depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG
 	help
 	  Kernel-level support for the Direct Rendering Infrastructure (DRI)
 	  introduced in XFree86 4.0. If you say Y here, you need to select