Merge commit 'v2.6.33' into tracing/core

Conflicts:
	scripts/recordmcount.pl

Merge reason: Merge up to v2.6.33.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 6 insertions, 2 deletions

diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 545fe7154ced..f3c9c0a90b98 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -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";
+    }
 }
 
 #