From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 May 2012 22:10:28 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: v3.12-rc1~3094
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce004178be1bbaa292e9e6497939e2970300095a;p=kernel%2Fkernel-generic.git

Merge git://git./linux/kernel/git/davem/sparc

Pull sparc changes from David S. Miller:
 "This has the generic strncpy_from_user() implementation architectures
  can now use, which we've been developing on linux-arch over the past
  few days.

  For good measure I ran both a 32-bit and a 64-bit glibc testsuite run,
  and the latter of which pointed out an adjustment I needed to make to
  sparc's user_addr_max() definition.  Linus, you were right, STACK_TOP
  was not the right thing to use, even on sparc itself :-)

  From Sam Ravnborg, we have a conversion of sparc32 over to the common
  alloc_thread_info_node(), since the aspect which originally blocked
  our doing so (sun4c) has been removed."

Fix up trivial arch/sparc/Kconfig and lib/Makefile conflicts.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Fix user_addr_max() definition.
  lib: Sparc's strncpy_from_user is generic enough, move under lib/
  kernel: Move REPEAT_BYTE definition into linux/kernel.h
  sparc: Increase portability of strncpy_from_user() implementation.
  sparc: Optimize strncpy_from_user() zero byte search.
  sparc: Add full proper error handling to strncpy_from_user().
  sparc32: use the common implementation of alloc_thread_info_node()
---

ce004178be1bbaa292e9e6497939e2970300095a
diff --cc arch/sparc/Kconfig
index 2d493a3,2247423..15e9e05
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@@ -32,15 -32,12 +32,15 @@@ config SPAR
  	select HAVE_NMI_WATCHDOG if SPARC64
  	select HAVE_BPF_JIT
  	select GENERIC_SMP_IDLE_THREAD
 +	select GENERIC_CMOS_UPDATE
 +	select GENERIC_CLOCKEVENTS
+ 	select GENERIC_STRNCPY_FROM_USER
  
  config SPARC32
  	def_bool !64BIT
  	select GENERIC_ATOMIC64
  	select CLZ_TAB
- 	select ARCH_THREAD_INFO_ALLOCATOR
 +	select ARCH_USES_GETTIMEOFFSET
  
  config SPARC64
  	def_bool 64BIT
diff --cc lib/Makefile
index 74290c9,57538b4..b98df50
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -123,8 -123,8 +123,10 @@@ obj-$(CONFIG_SIGNATURE) += digsig.
  
  obj-$(CONFIG_CLZ_TAB) += clz_tab.o
  
 +obj-$(CONFIG_DDR) += jedec_ddr_data.o
 +
+ obj-$(CONFIG_GENERIC_STRNCPY_FROM_USER) += strncpy_from_user.o
+ 
  hostprogs-y	:= gen_crc32table
  clean-files	:= crc32table.h