Edk2 commit 4e1f316cec3f ("MdePkg: Update IndustryStandard/SmBios.h with
processor status data", 2021-02-08) upstreamed the PROCESSOR_STATUS_DATA
type, so now the identical typedef in "ProcessorSubClass.h" is
superfluous, and conflicts, breaking the Hisilicon DSCs' compilation.
Remove it.Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> Cc: Leif Lindholm <quic_llind...@quicinc.com> Cc: Wenyi Xie <xiewen...@huawei.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=4564 Signed-off-by: Laszlo Ersek <ler...@redhat.com> --- Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h index e1c41ab65e4c..7ed6696a1f23 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h @@ -68,19 +68,6 @@ typedef union { UINT16 Data; }CACHE_CONFIGURATION; -// -// Processor Status -// -typedef union { - struct { - UINT8 CpuStatus :3; // Indicates the status of the processor. - UINT8 Reserved1 :3; // Reserved for future use. Should be set to zero. - UINT8 SocketPopulated :1; // Indicates if the processor socket is populated or not. - UINT8 Reserved2 :1; // Reserved for future use. Should be set to zero. - } Bits; - UINT8 Data; -}PROCESSOR_STATUS_DATA; - // // Processor Characteristics // -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109546): https://edk2.groups.io/g/devel/message/109546 Mute This Topic: https://groups.io/mt/101914655/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
