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

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 70ae9d81870..868ea08dff0 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"