diff options
| author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2005-10-30 15:00:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 17:37:16 -0800 |
| commit | b365157be3250a6b5948422ba65e05e5f964e150 (patch) | |
| tree | cd365dd42b15cc58f74bcc0d31a5ba34a817c354 /arch | |
| parent | 96d55b882b85b26711a06d8fb2c901df9d52a48b (diff) | |
| download | linux-3.10-b365157be3250a6b5948422ba65e05e5f964e150.tar.gz linux-3.10-b365157be3250a6b5948422ba65e05e5f964e150.tar.bz2 linux-3.10-b365157be3250a6b5948422ba65e05e5f964e150.zip | |
[PATCH] uml: fix "reuse i386 cpu optimizations"
Remove RWSEM_GENERIC_SPINLOCK, it's now defined (only if needed) by the
underlying arch/i386/Kconfig.cpu. Leave it only for x86_64. Even there, it's
totally wrong, as they even have the code to support XCHG_ADD.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/Kconfig | 4 | ||||
| -rw-r--r-- | arch/um/Kconfig.x86_64 | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index ceaf6e4d285..cd06ed7d842 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -27,10 +27,6 @@ config UID16 bool default y -config RWSEM_GENERIC_SPINLOCK - bool - default y - config GENERIC_CALIBRATE_DELAY bool default y diff --git a/arch/um/Kconfig.x86_64 b/arch/um/Kconfig.x86_64 index bd35e59419c..aae19bc4b06 100644 --- a/arch/um/Kconfig.x86_64 +++ b/arch/um/Kconfig.x86_64 @@ -6,6 +6,11 @@ config 64BIT bool default y +#XXX: this is so in the underlying arch, but it's wrong!!! +config RWSEM_GENERIC_SPINLOCK + bool + default y + config SEMAPHORE_SLEEPERS bool default y |