From 6ac05ba48600d2174b455f3773059bfbbfb9858c Mon Sep 17 00:00:00 2001
From: Mark Johnston <markj@FreeBSD.org>
Date: Fri, 13 Jul 2018 17:42:48 +0000
Subject: [PATCH] Use C99 initializers for instances of struct apic_enumerator.

MFC after:	3 days
---
 sys/x86/acpica/madt.c    | 10 +++++-----
 sys/x86/x86/mptable.c    | 10 +++++-----
 sys/x86/xen/pvcpu_enum.c | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c
index 89d671d2c497..d9b58d3e7442 100644
--- a/sys/x86/acpica/madt.c
+++ b/sys/x86/acpica/madt.c
@@ -93,11 +93,11 @@ static int	madt_setup_io(void);
 static void	madt_walk_table(acpi_subtable_handler *handler, void *arg);
 
 static struct apic_enumerator madt_enumerator = {
-	"MADT",
-	madt_probe,
-	madt_probe_cpus,
-	madt_setup_local,
-	madt_setup_io
+	.apic_name = "MADT",
+	.apic_probe = madt_probe,
+	.apic_probe_cpus = madt_probe_cpus,
+	.apic_setup_local = madt_setup_local,
+	.apic_setup_io = madt_setup_io
 };
 
 /*
diff --git a/sys/x86/x86/mptable.c b/sys/x86/x86/mptable.c
index 87741acf1ab3..fca234a5c9e7 100644
--- a/sys/x86/x86/mptable.c
+++ b/sys/x86/x86/mptable.c
@@ -206,11 +206,11 @@ static void	mptable_walk_table(mptable_entry_handler *handler, void *arg);
 static int	search_for_sig(u_int32_t target, int count);
 
 static struct apic_enumerator mptable_enumerator = {
-	"MPTable",
-	mptable_probe,
-	mptable_probe_cpus,
-	mptable_setup_local,
-	mptable_setup_io
+	.apic_name = "MPTable",
+	.apic_probe = mptable_probe,
+	.apic_probe_cpus = mptable_probe_cpus,
+	.apic_setup_local = mptable_setup_local,
+	.apic_setup_io = mptable_setup_io
 };
 
 /*
diff --git a/sys/x86/xen/pvcpu_enum.c b/sys/x86/xen/pvcpu_enum.c
index e11471ba3712..e647a6fe8e9d 100644
--- a/sys/x86/xen/pvcpu_enum.c
+++ b/sys/x86/xen/pvcpu_enum.c
@@ -68,11 +68,11 @@ static vm_paddr_t madt_physaddr;
 static vm_offset_t madt_length;
 
 static struct apic_enumerator xenpv_enumerator = {
-	"Xen PV",
-	xenpv_probe,
-	xenpv_probe_cpus,
-	xenpv_setup_local,
-	xenpv_setup_io
+	.apic_name = "Xen PV",
+	.apic_probe = xenpv_probe,
+	.apic_probe_cpus = xenpv_probe_cpus,
+	.apic_setup_local = xenpv_setup_local,
+	.apic_setup_io = xenpv_setup_io
 };
 
 /*--------------------- Helper functions to parse MADT -----------------------*/