summaryrefslogtreecommitdiffstats
path: root/arch/sparc/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-09 14:47:06 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-09 14:47:06 -0800
commit37cfc3f67db9f2d907f6bfcfae590cdbbef623e8 (patch)
treeb573983938838dd76b40a7b53b3744472041720f /arch/sparc/Kconfig
parent38e5781bbf8e82c1635ea845e0d07b2228a5ac7a (diff)
parent6e4d177dc07b1c4d8e6ef061fe5ffcc7e7646546 (diff)
downloadblackbird-op-linux-37cfc3f67db9f2d907f6bfcfae590cdbbef623e8.tar.gz
blackbird-op-linux-37cfc3f67db9f2d907f6bfcfae590cdbbef623e8.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next: sparc32: remove unused file: include/asm/pgtsun4.h sparc32: fix PAGE_SIZE definition sparc32: enable different preemptions models sparc32: support atomic64_t apbuart: fix section mismatch warning sparc32: drop useless preprocessor conditional in atomic_32.h sparc32: drop unused atomic24 support
Diffstat (limited to 'arch/sparc/Kconfig')
-rw-r--r--arch/sparc/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 70ae9d81870e..868ea08dff0b 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -31,6 +31,7 @@ config SPARC
config SPARC32
def_bool !64BIT
+ select GENERIC_ATOMIC64
config SPARC64
def_bool 64BIT
@@ -383,9 +384,7 @@ config SCHED_MC
making when dealing with multi-core CPU chips at a cost of slightly
increased overhead in some places. If unsure say N here.
-if SPARC64
source "kernel/Kconfig.preempt"
-endif
config CMDLINE_BOOL
bool "Default bootloader kernel arguments"
OpenPOWER on IntegriCloud