x86: structure declaration renaming

Renamed common structures to vendor specific naming scheme
so other vendors will be able to use the same naming
convention.

Signed-off-by: Peter Oruba <peter.oruba@amd.com>
Cc: Tigran Aivazian <tigran@aivazian.fsnet.co.uk>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 6 insertions, 4 deletions

diff --git a/include/asm-x86/microcode.h b/include/asm-x86/microcode.h
index d34a1fc1b173..ef77c6f438bf 100644
--- a/include/asm-x86/microcode.h
+++ b/include/asm-x86/microcode.h
@@ -1,4 +1,4 @@
-struct microcode_header {
+struct microcode_header_intel {
         unsigned int            hdrver;
         unsigned int            rev;
         unsigned int            date;
@@ -11,8 +11,8 @@ struct microcode_header {
         unsigned int            reserved[3];
 };
 
-struct microcode {
-        struct microcode_header hdr;
+struct microcode_intel {
+        struct microcode_header_intel hdr;
         unsigned int            bits[0];
 };
 
@@ -35,5 +35,7 @@ struct ucode_cpu_info {
         unsigned int sig;
         unsigned int pf;
         unsigned int rev;
-        struct microcode *mc;
+        union {
+                struct microcode_intel *mc_intel;
+        } mc;
 };