Merge tag 'arc-4.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

Pull ARC fixes from Vineet Gupta:
 "I've been sitting on some of these fixes for a while.

   - Corner case of returning to delay slot from interrupt
   - Changing default interrupt prioiry level
   - Kconfig'ize support for super pages
   - Other minor fixes"

* tag 'arc-4.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: mm: Introduce explicit super page size support
  ARCv2: intc: Allow interruption by lowest priority interrupt
  ARCv2: Check for LL-SC livelock only if LLSC is enabled
  ARC: shrink cpuinfo by not saving full timer BCR
  ARCv2: clocksource: Rename GRTC -> GFRC ...
  ARCv2: STAR 9000950267: Handle return from intr to Delay Slot #2

diff --combined arch/arc/Kconfig
index 76dde9db79349d0977687623307c934de91e314a,63979c7eede511fd04b4ae1045a59359a47df6a3..0655495470ad499acc022d622914746929d47ea1
--- 1/arch/arc/Kconfig
--- 2/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@@ -73,6 -73,9 +73,6 @@@ config STACKTRACE_SUPPOR
        def_bool y
        select STACKTRACE
  
 -config HAVE_LATENCYTOP_SUPPORT
 -      def_bool y
 -
  config HAVE_ARCH_TRANSPARENT_HUGEPAGE
        def_bool y
        depends on ARC_MMU_V4
@@@ -338,6 -341,19 +338,19 @@@ config ARC_PAGE_SIZE_4
  
  endchoice
  
+ choice
+       prompt "MMU Super Page Size"
+       depends on ISA_ARCV2 && TRANSPARENT_HUGEPAGE
+       default ARC_HUGEPAGE_2M
+ 
+ config ARC_HUGEPAGE_2M
+       bool "2MB"
+ 
+ config ARC_HUGEPAGE_16M
+       bool "16MB"
+ 
+ endchoice
+ 
  if ISA_ARCOMPACT
  
  config ARC_COMPACT_IRQ_LEVELS
@@@ -410,7 -426,7 +423,7 @@@ config ARC_HAS_RT
        default n
        depends on !SMP
  
- config ARC_HAS_GRTC
+ config ARC_HAS_GFRC
        bool "SMP synchronized 64-bit cycle counter"
        default y
        depends on SMP
@@@ -566,6 -582,12 +579,12 @@@ endmen
  endmenu        # "ARC Architecture Configuration"
  
  source "mm/Kconfig"
+ 
+ config FORCE_MAX_ZONEORDER
+       int "Maximum zone order"
+       default "12" if ARC_HUGEPAGE_16M
+       default "11"
+ 
  source "net/Kconfig"
  source "drivers/Kconfig"
  source "fs/Kconfig"