Merge branch 'for-linus' of git://www.jni.nu/cris

* 'for-linus' of git://www.jni.nu/cris: (51 commits)
  CRIS: Fix alignment problem for older ld
  CRIS: Always dump registers for segfaulting process.
  CRIS: Add config for pausing a seg-faulting process
  CRIS: Don't take faults while in_atomic
  CRIS: Fixup lookup for delay slot faults
  CRIS: Discard exit.text and .data at runtime
  CRIS: Add cache aligned and read mostly data sections
  CRIS: Return something from profile write
  CRIS: Add ARTPEC-3 and timestamps for sync-serial
  CRIS: Better ARTPEC-3 support for gpio
  CRIS: Add include guard
  CRIS: Better handling of pinmux settings
  CRIS: New DMA defines for ARTPEC-3
  CRIS: __do_strncpy_from_user: Don't read the byte beyond the nil
  CRIS: Pagetable for ARTPEC-3
  CRIS: Machine dependent memmap.h
  CRIS: Check if pointer is set before using it
  CRIS: Machine dependent dma.h
  CRIS: Define __read_mostly for CRISv32
  CRIS: Discard .note.gnu.build-id section
  ...

1 files changed, 4 insertions, 1 deletions

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 887ef855be2a..aefe3b18a074 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -24,7 +24,7 @@ config GENERIC_CMOS_UPDATE
         def_bool y
 
 config ARCH_USES_GETTIMEOFFSET
-        def_bool y
+        def_bool n
 
 config GENERIC_IOMAP
        bool
@@ -128,16 +128,19 @@ choice
 
 config ETRAX100LX
         bool "ETRAX-100LX-v1"
+        select ARCH_USES_GETTIMEOFFSET
         help
           Support version 1 of the ETRAX 100LX.
 
 config ETRAX100LX_V2
         bool "ETRAX-100LX-v2"
+        select ARCH_USES_GETTIMEOFFSET
         help
           Support version 2 of the ETRAX 100LX.
 
 config SVINTO_SIM
         bool "ETRAX-100LX-for-xsim-simulator"
+        select ARCH_USES_GETTIMEOFFSET
         help
           Support the xsim ETRAX Simulator.