2006-03-21  Gwenole Beauchesne  <gbeauchesne@mandriva.com>

	* features.c (intel_cap_generic_ecx_flags): Add sse4 and vmx.
	(intel_cap_extended_ecx_flags): Fix lahf_lm detection.

--- x86info-1.17/features.c.intel-flags	2005-11-05 01:05:52.000000000 +0100
+++ x86info-1.17/features.c	2006-03-21 22:16:20.000000000 +0100
@@ -59,8 +59,8 @@ void decode_feature_flags (struct cpudat
 	};
 	/* CPUID 0x00000001 ECX flags */
 	const char *intel_cap_generic_ecx_flags[] = {
-		"sse3", NULL, NULL, "monitor", "ds-cpl", NULL, NULL, "est",
-		"tm2", NULL, "cntx-id", NULL, NULL, "cx16", "xTPR", NULL,
+		"sse3", NULL, NULL, "monitor", "ds-cpl", "vmx", NULL, "est",
+		"tm2", "sse4", "cntx-id", NULL, NULL, "cx16", "xTPR", NULL,
 		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 
 		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 	};
@@ -73,9 +73,9 @@ void decode_feature_flags (struct cpudat
 	};
 	/* CPUID 0x80000001 ECX flags */
 	const char *intel_cap_extended_ecx_flags[] = {
+		"lahf_lm", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-		NULL, NULL, NULL, NULL, "LAHF", NULL, NULL, NULL,
 		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 	};