lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.33' into tracing/core

Browse Source 
Conflicts:
	scripts/recordmcount.pl

Merge reason: Merge up to v2.6.33.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2010-02-26 09:18:32 +01:00
parent 83f0d53993 60b341b778
commit 64b9fb5704
1606 changed files with 38405 additions and 15357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/recordmcount.pl
View File

@ -195,8 +195,12 @@ sub check_objcopy
}
}
if ($arch eq 'x86') {
$arch = ($bits == 64) ? 'x86_64' : 'i386';
if ($arch =~ /(x86(_64)?)|(i386)/) {
if ($bits == 64) {
$arch = "x86_64";
} else {
$arch = "i386";
}
}
#