diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/CPUDetect.cpp
index 6a9a234071..65dc8d700b 100644
--- a/Source/Core/Common/Src/CPUDetect.cpp
+++ b/Source/Core/Common/Src/CPUDetect.cpp
@@ -35,19 +35,29 @@
 static inline void do_cpuid(unsigned int *eax, unsigned int *ebx,
 						    unsigned int *ecx, unsigned int *edx)
 {
-// Note: EBX is reserved on Mac OS X and in PIC on Linux, so it has to be
-//       restored at the end of the asm block.
-__asm__(
+#ifdef _LP64
+	__asm__("cpuid"
+		: "=a" (*eax),
+		"=b" (*ebx),
+		"=c" (*ecx),
+		"=d" (*edx)
+		: "a"  (*eax)
+		);
+#else
+		// Note: EBX is reserved on Mac OS X and in PIC on Linux, so it has to
+		// restored at the end of the asm block. 
+	__asm__(
 		"pushl  %%ebx;"
 		"cpuid;"
 		"movl   %%ebx,%1;"
 		"popl   %%ebx;"
 		: "=a" (*eax),
-		  "=r" (*ebx),
-		  "=c" (*ecx),
-		  "=d" (*edx)
-		: "a"  (*eax)
+		"=r" (*ebx),
+		"=c" (*ecx),
+		"=d" (*edx)
+		: "a"  (*eax) 
 		);
+#endif
 }
 
 static void __cpuid(int info[4], int x)