Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next

Pull sparc updates from David Miller:

1) Kill off support for sun4c and Cypress sun4m chips.

   And as a result we were able to also kill off that ugly btfixup thing
   that required multi-stage links of the final vmlinux image in the
   Kbuild system.  This should make the kbuild maintainers really happy.

   Thanks a lot to Sam Ravnborg for his tireless efforts to get this
   going.

2) Convert sparc64 to nobootmem.  I suspect now with sparc32 being a lot
   cleaner, it should be able to fall in line and modernize in this area
   too.

3) Make sparc32 use generic clockevents, from Tkhai Kirill.

[ I fixed up the BPF rules, and tried to clean up the build rules too.
  But I don't have - or want - a sparc cross-build environment, so the
  BPF rule bug and the related build cleanup was all done with just a
  bare "make -n" pseudo-test.      - Linus ]

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next: (110 commits)
  sparc32: use flushi when run-time patching in per_cpu_patch
  sparc32: fix cpuid_patch run-time patching
  sparc32: drop unused inline functions in srmmu.c
  sparc32: drop unused functions in pgtsrmmu.h
  sparc32,leon: move leon mmu functions to leon_mm.c
  sparc32,leon: remove duplicate definitions in leon.h
  sparc32,leon: remove duplicate UART register definitions
  sparc32,leon: move leon ASI definitions to asi.h
  sparc32: move trap table to a separate file
  sparc64: renamed ttable.S to ttable_64.S
  sparc32: Remove asm/sysen.h header.
  sparc32: Delete asm/smpprim.h
  sparc32: Remove unused empty_bad_page{,_table} declarations.
  sparc32: Kill boot_cpu_id4
  sparc32: Move GET_PROCESSOR*_ID() out of asm/asmmacro.h
  sparc32: Remove completely unused code from asm/cache.h
  sparc32: Add ucmpdi2.o to obj-y instead of lib-y.
  sparc32: add ucmpdi2
  sparc: introduce arch/sparc/Kbuild
  sparc: remove obsolete documentation
  ...

1 files changed, 4 insertions, 8 deletions

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 5f6acce45a0d..6c49ed2ee786 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -30,7 +30,7 @@ config SPARC
         select USE_GENERIC_SMP_HELPERS if SMP
         select GENERIC_PCI_IOMAP
         select HAVE_NMI_WATCHDOG if SPARC64
-        select HAVE_BPF_JIT
+        select HAVE_BPF_JIT if NET
 
 config SPARC32
         def_bool !64BIT
@@ -62,6 +62,7 @@ config SPARC64
         select IRQ_PREFLOW_FASTEOI
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
         select HAVE_C_RECORDMCOUNT
+        select NO_BOOTMEM
 
 config ARCH_DEFCONFIG
         string
@@ -74,17 +75,12 @@ config BITS
         default 32 if SPARC32
         default 64 if SPARC64
 
-config ARCH_USES_GETTIMEOFFSET
-        bool
-        default y if SPARC32
-
 config GENERIC_CMOS_UPDATE
         bool
         default y
 
 config GENERIC_CLOCKEVENTS
-        bool
-        default y if SPARC64
+        def_bool y
 
 config IOMMU_HELPER
         bool
@@ -155,7 +151,7 @@ source "kernel/Kconfig.freezer"
 menu "Processor type and features"
 
 config SMP
-        bool "Symmetric multi-processing support (does not work on sun4/sun4c)"
+        bool "Symmetric multi-processing support"
         ---help---
           This enables support for systems with more than one CPU. If you have
           a system with only one CPU, say N. If you have a system with more