diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-24 15:10:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-24 15:10:28 -0700 |
| commit | ce004178be1bbaa292e9e6497939e2970300095a (patch) | |
| tree | 1cd5306548947deaedd612189b56d35265217e8e /lib/Makefile | |
| parent | 9978306e31a8f89bd81fbc4c49fd9aefb1d30d10 (diff) | |
| parent | c5389831cda3b38a56606a348a537a1332f2d729 (diff) | |
| download | linux-3.10-ce004178be1bbaa292e9e6497939e2970300095a.tar.gz linux-3.10-ce004178be1bbaa292e9e6497939e2970300095a.tar.bz2 linux-3.10-ce004178be1bbaa292e9e6497939e2970300095a.zip | |
Merge git://git.kernel.org/pub/scm/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()
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile index 74290c9e286..b98df505f33 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -125,6 +125,8 @@ 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 |