diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-26 19:57:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-26 19:57:16 -0400 |
commit | 1e2aec873ad6d16538512dbb96853caa1fa076af (patch) | |
tree | d792b19ac47be44debd24610ae27f1330fa490e4 /lib/Makefile | |
parent | ae32adc1e06d096399f195eeda12d443d53539c4 (diff) | |
parent | 2c66f623631709aa5f2e4c14c7e089682e7394a3 (diff) |
Merge branch 'generic-string-functions'
This makes <asm/word-at-a-time.h> actually live up to its promise of
allowing architectures to help tune the string functions that do their
work a word at a time.
David had already taken the x86 strncpy_from_user() function, modified
it to work on sparc, and then done the extra work to make it generically
useful. This then expands on that work by making x86 use that generic
version, completing the circle.
But more importantly, it fixes up the word-at-a-time interfaces so that
it's now easy to also support things like strnlen_user(), and pretty
much most random string functions.
David reports that it all works fine on sparc, and Jonas Bonn reported
that an earlier version of this worked on OpenRISC too. It's pretty
easy for architectures to add support for this and just replace their
private versions with the generic code.
* generic-string-functions:
sparc: use the new generic strnlen_user() function
x86: use the new generic strnlen_user() function
lib: add generic strnlen_user() function
word-at-a-time: make the interfaces truly generic
x86: use generic strncpy_from_user routine
Diffstat (limited to 'lib/Makefile')
-rw-r--r-- | lib/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile index 2a1d7f9d39a2..8c31a0cb75e9 100644 --- a/lib/Makefile +++ b/lib/Makefile | |||
@@ -126,6 +126,7 @@ obj-$(CONFIG_CLZ_TAB) += clz_tab.o | |||
126 | obj-$(CONFIG_DDR) += jedec_ddr_data.o | 126 | obj-$(CONFIG_DDR) += jedec_ddr_data.o |
127 | 127 | ||
128 | obj-$(CONFIG_GENERIC_STRNCPY_FROM_USER) += strncpy_from_user.o | 128 | obj-$(CONFIG_GENERIC_STRNCPY_FROM_USER) += strncpy_from_user.o |
129 | obj-$(CONFIG_GENERIC_STRNLEN_USER) += strnlen_user.o | ||
129 | 130 | ||
130 | obj-$(CONFIG_STMP_DEVICE) += stmp_device.o | 131 | obj-$(CONFIG_STMP_DEVICE) += stmp_device.o |
131 | 132 | ||