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()
This commit is contained in:
@@ -194,7 +194,7 @@ sub check_objcopy
|
||||
}
|
||||
}
|
||||
|
||||
if ($arch eq "x86") {
|
||||
if ($arch =~ /(x86(_64)?)|(i386)/) {
|
||||
if ($bits == 64) {
|
||||
$arch = "x86_64";
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user