summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-16 12:27:25 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-16 12:27:25 -0800
commit6ccc347b699681a0b21c2f7b1a1f85500a58c6b8 (patch)
treeabe33c75ae53d445abde0e5986b96ef696501d38 /include
parenteb29a5cc0b601c458bae9df2f6c3696d75c2d383 (diff)
parentd1303dd1d6b220cab375f24fa91a5640e54e169e (diff)
downloadop-kernel-dev-6ccc347b699681a0b21c2f7b1a1f85500a58c6b8.zip
op-kernel-dev-6ccc347b699681a0b21c2f7b1a1f85500a58c6b8.tar.gz
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing/filters: Add comment for match callbacks tracing/filters: Fix MATCH_FULL filter matching for PTR_STRING tracing/filters: Fix MATCH_MIDDLE_ONLY filter matching lib: Introduce strnstr() tracing/filters: Fix MATCH_END_ONLY filter matching tracing/filters: Fix MATCH_FRONT_ONLY filter matching ftrace: Fix MATCH_END_ONLY function filter tracing/x86: Derive arch from bits argument in recordmcount.pl ring-buffer: Add rb_list_head() wrapper around new reader page next field ring-buffer: Wrap a list.next reference with rb_list_head()
Diffstat (limited to 'include')
-rw-r--r--include/linux/string.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/string.h b/include/linux/string.h
index 651839a..a716ee2 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -72,7 +72,10 @@ static inline __must_check char *strstrip(char *str)
}
#ifndef __HAVE_ARCH_STRSTR
-extern char * strstr(const char *,const char *);
+extern char * strstr(const char *, const char *);
+#endif
+#ifndef __HAVE_ARCH_STRNSTR
+extern char * strnstr(const char *, const char *, size_t);
#endif
#ifndef __HAVE_ARCH_STRLEN
extern __kernel_size_t strlen(const char *);
OpenPOWER on IntegriCloud