Merge branch 'x86-topology-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / arch / x86 / include / asm / processor.h

diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 6aba36bde57f28084d042ef43eeb73f12a007c4b..3eab6ece52b44b25d156fa11027d69f8b0efbf88 100644 (file)
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -146,7 +146,8 @@ enum cpuid_regs_idx {
 #define X86_VENDOR_TRANSMETA   7
 #define X86_VENDOR_NSC         8
 #define X86_VENDOR_HYGON       9
-#define X86_VENDOR_NUM         10
+#define X86_VENDOR_ZHAOXIN     10
+#define X86_VENDOR_NUM         11
 
 #define X86_VENDOR_UNKNOWN     0xff