diff options
| author | Martin Habets <errandir_news@mph.eclipse.co.uk> | 2007-05-29 01:11:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-05-29 02:51:24 -0700 |
| commit | 5f81941c9d47f783e834028dcfb8548809da5a53 (patch) | |
| tree | 8d528138012db5f8436a6822c79aea82977a8e90 | |
| parent | 6197fe4d720ea3e2ee94cdc7ef32d6c0151199de (diff) | |
| download | linux-5f81941c9d47f783e834028dcfb8548809da5a53.tar.gz linux-5f81941c9d47f783e834028dcfb8548809da5a53.tar.bz2 linux-5f81941c9d47f783e834028dcfb8548809da5a53.zip | |
[SPARC]: Mark as emulating cmpxchg, add appropriate depends for DRM.
The DRM code depends on an atomic version of cmpxchg(), which is not
available on sparc32. Since other platforms besides sparc32 have this
issue a KCONFIG option is added for it.
Signed-off-by: Martin Habets <errandir_news@mph.eclipse.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/char/drm/Kconfig | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index bd992c0048f0..fbcc00c6c06e 100644 --- a/arch/sparc/Kconfig +++ b/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/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig index ef833a1c27eb..0b7ffa5191c6 100644 --- a/drivers/char/drm/Kconfig +++ b/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 |