mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
bootfdt: Add missing trailing commas in BOOTINFO_{ACPI,SHMEM}_INIT
Commita14593e399extended BOOTINFO_{ACPI,SHMEM}_INIT initializers list with a new 'type' member but forgot to add trailing commas (they were present before). This results in a build failure when building with CONFIG_ACPI=y and CONFIG_STATIC_SHM=y: ./include/xen/bootfdt.h:155:5: error: request for member 'shmem' in something not a structure or union 155 | .shmem.common.max_banks = NR_SHMEM_BANKS, \ | ^ ./include/xen/bootfdt.h:168:5: note: in expansion of macro 'BOOTINFO_SHMEM_INIT' 168 | BOOTINFO_SHMEM_INIT \ | ^~~~~~~~~~~~~~~~~~~ common/device-tree/bootinfo.c:22:39: note: in expansion of macro 'BOOTINFO_INIT' 22 | struct bootinfo __initdata bootinfo = BOOTINFO_INIT; Fixes:a14593e399("xen/device-tree: Allow region overlapping with /memreserve/ ranges") Signed-off-by: Michal Orzel <michal.orzel@amd.com> Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com> Reviewed-by: Luca Fancellu <luca.fancellu@arm.com>
This commit is contained in:
1 parent
28301682f4
commit
5a455a52ea
1 file changed
+2
-2
@@ -145,7 +145,7 @@ struct bootinfo {
|
||||
#ifdef CONFIG_ACPI
|
||||
#define BOOTINFO_ACPI_INIT \
|
||||
.acpi.common.max_banks = NR_MEM_BANKS, \
|
||||
.acpi.common.type = MEMORY
|
||||
.acpi.common.type = MEMORY,
|
||||
#else
|
||||
#define BOOTINFO_ACPI_INIT
|
||||
#endif
|
||||
@@ -153,7 +153,7 @@ struct bootinfo {
|
||||
#ifdef CONFIG_STATIC_SHM
|
||||
#define BOOTINFO_SHMEM_INIT \
|
||||
.shmem.common.max_banks = NR_SHMEM_BANKS, \
|
||||
.shmem.common.type = STATIC_SHARED_MEMORY
|
||||
.shmem.common.type = STATIC_SHARED_MEMORY,
|
||||
#else
|
||||
#define BOOTINFO_SHMEM_INIT
|
||||
#endif
|
||||
|
||||