Drop the uint64_t #defines from the XSAVE test, as they are unnecessary
(typedef'd by stdint-uintn.h) and confusing (the test is 64-bit only).

Opportunistically use "u64" throughout the test, for brevity and for
consistency (tracking xcr0 as two different types is bizarre).

No functional change intended.

Signed-off-by: Sean Christopherson <seanjc@google.com>
---
 x86/xsave.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/x86/xsave.c b/x86/xsave.c
index f18d66a1..fc18a4b0 100644
--- a/x86/xsave.c
+++ b/x86/xsave.c
@@ -2,12 +2,6 @@
 #include "desc.h"
 #include "processor.h"
 
-#ifdef __x86_64__
-#define uint64_t unsigned long
-#else
-#define uint64_t unsigned long long
-#endif
-
 #define XCR_XFEATURE_ENABLED_MASK	0x00000000
 #define XCR_XFEATURE_ILLEGAL_MASK	0x00000010
 
@@ -17,10 +11,8 @@
 
 static void test_xsave(void)
 {
+	u64 supported_xcr0, xcr0, test_bits;
 	unsigned long cr4;
-	uint64_t supported_xcr0;
-	uint64_t test_bits;
-	u64 xcr0;
 
 	printf("Legal instruction testing:\n");
 
-- 
2.52.0.rc2.455.g230fcf2819-goog