From d4b7398d3f540b60640faf9079782c2ec1ee92b6 Mon Sep 17 00:00:00 2001 From: Martin Habets Date: Tue, 29 May 2007 01:11:57 -0700 Subject: [PATCH] --- yaml --- r: 57080 b: refs/heads/master c: 5f81941c9d47f783e834028dcfb8548809da5a53 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sparc/Kconfig | 7 +++++++ trunk/drivers/char/drm/Kconfig | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ab58b3cefaeb..e6cc02728ef5 100644 --- 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 index bd992c0048f0..fbcc00c6c06e 100644 --- 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 index ef833a1c27eb..0b7ffa5191c6 100644 --- 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