From ede2ebacb1667fe7e11256389fd8138d34aee36d Mon Sep 17 00:00:00 2001 From: Dean Nelson Date: Fri, 7 Oct 2022 08:57:10 -0500 Subject: [PATCH] Remove a duplicate of ACPI_SIG_CEDT Bugzilla: https://bugzilla.redhat.com/2123131 Upstream Status: https://github.com/acpica/acpica.git commit 7021087eedb0d7156286e9e4f255e93c07816921 Author: Robert Moore Date: Fri Aug 26 12:20:07 2022 -0700 Remove a duplicate of ACPI_SIG_CEDT Resolves: rhbz#2123131 Signed-off-by: Dean Nelson --- CEDT-support_11.patch | 18 ++++++++++++++++++ acpica-tools.spec | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 CEDT-support_11.patch diff --git a/CEDT-support_11.patch b/CEDT-support_11.patch new file mode 100644 index 0000000..f1205b7 --- /dev/null +++ b/CEDT-support_11.patch @@ -0,0 +1,18 @@ +commit 7021087eedb0d7156286e9e4f255e93c07816921 +Author: Robert Moore +Date: Fri Aug 26 12:20:07 2022 -0700 + + Remove a duplicate of ACPI_SIG_CEDT + +diff --git a/source/tools/acpisrc/astable.c b/source/tools/acpisrc/astable.c +index b984e6a..9f84aea 100644 +--- a/source/tools/acpisrc/astable.c ++++ b/source/tools/acpisrc/astable.c +@@ -541,7 +541,6 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = { + {"ACPI_TABLE_CSRT", SRC_TYPE_STRUCT}, + {"ACPI_TABLE_DBG2", SRC_TYPE_STRUCT}, + {"ACPI_TABLE_DBGP", SRC_TYPE_STRUCT}, +- {"ACPI_TABLE_CEDT", SRC_TYPE_STRUCT}, + {"ACPI_TABLE_DMAR", SRC_TYPE_STRUCT}, + {"ACPI_TABLE_DRTM", SRC_TYPE_STRUCT}, + {"ACPI_TABLE_ECDT", SRC_TYPE_STRUCT}, diff --git a/acpica-tools.spec b/acpica-tools.spec index dad9ab1..2829aee 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -96,6 +96,7 @@ Patch117: wpbt-unicode.patch Patch118: CEDT-support_08.patch Patch119: CEDT-support_09.patch Patch120: CEDT-support_10.patch +Patch121: CEDT-support_11.patch BuildRequires: make BuildRequires: bison patchutils flex gcc @@ -265,6 +266,7 @@ fi - Backport 19b11f91660b ("Add the subtable CFMWS to the CEDT table"). - Backport d9798f5275bb ("Fix Compile issue with CEDT and add template"). - Backport 0914618b553d ("Automated cleanup; No functional changes"). +- Backport 7021087eedb0 ("Remove a duplicate of ACPI_SIG_CEDT"). * Mon Oct 03 2022 Dean Nelson - 20210604-4 - Add in big-endian patches for PRMT, RGRT and SVKL tables.