From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 May 2012 17:32:01 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next
X-Git-Tag: v3.5-rc1~190
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9daeaa370526df1c19eba4780247bb7155541e38;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge git://git./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
  ...
---

9daeaa370526df1c19eba4780247bb7155541e38
diff --cc arch/sparc/Kbuild
index 00000000000,27b540d2d55..5cd01161fd0
mode 000000,100644..100644
--- a/arch/sparc/Kbuild
+++ b/arch/sparc/Kbuild
@@@ -1,0 -1,7 +1,8 @@@
+ #
+ # core part of the sparc kernel
+ #
+ 
+ obj-y += kernel/
+ obj-y += mm/
+ obj-y += math-emu/
++obj-y += net/
diff --cc arch/sparc/Kconfig
index 5f6acce45a0,871de4ec348..6c49ed2ee78
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@@ -30,7 -30,6 +30,7 @@@ config SPAR
  	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