x86/cpu: Use definitions from qemu/units.h

Backports commit 6a4e0614c3e2ca01ac030e9c486c77d4d7225021 from qemu
This commit is contained in:
Philippe Mathieu-Daudé 2018-07-03 19:48:36 -04:00 committed by Lioncash
parent 26948b6b98
commit f5698ff9a5
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7

View file

@ -18,6 +18,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/units.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "qemu/bitops.h" #include "qemu/bitops.h"
#include "unicorn/platform.h" #include "unicorn/platform.h"
@ -54,9 +55,6 @@ struct CPUID2CacheDescriptorInfo {
int associativity; int associativity;
}; };
#define KiB 1024
#define MiB (1024 * 1024)
/* /*
* Known CPUID 2 cache descriptors. * Known CPUID 2 cache descriptors.
* From Intel SDM Volume 2A, CPUID instruction * From Intel SDM Volume 2A, CPUID instruction