Page MenuHomeFreeBSD
Files F157058688

D55354.id172166.diff
No OneTemporary
Actions

D55354.id172166.diff
View Options

diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -1154,6 +1154,9 @@
free(dinfo, M_ACPIDEV);
}
+_Static_assert(ACPI_IVAR_PRIVATE >= ISA_IVAR_LAST,
+ "ACPI private IVARs overlap with ISA IVARs");
+
/*
* Handle per-device ivars
*/
diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
--- a/sys/dev/acpica/acpivar.h
+++ b/sys/dev/acpica/acpivar.h
@@ -278,10 +278,10 @@
* attach to ACPI.
*/
enum {
- ACPI_IVAR_HANDLE = BUS_IVARS_ACPI,
- ACPI_IVAR_PRIVATE,
+ ACPI_IVAR_PRIVATE = 20,
ACPI_IVAR_FLAGS,
- ACPI_IVAR_DOMAIN
+ ACPI_IVAR_DOMAIN,
+ ACPI_IVAR_HANDLE = BUS_IVARS_ACPI
};
/*
diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h
--- a/sys/isa/isavar.h
+++ b/sys/isa/isavar.h
@@ -128,7 +128,8 @@
ISA_IVAR_CONFIGATTR,
ISA_IVAR_PNP_CSN,
ISA_IVAR_PNP_LDN,
- ISA_IVAR_PNPBIOS_HANDLE
+ ISA_IVAR_PNPBIOS_HANDLE,
+ ISA_IVAR_LAST
};
/*

File Metadata

Mime Type
text/plain
Expires
Tue, May 19, 5:01 AM (5 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33292965
Default Alt Text
D55354.id172166.diff (941 B)

Event Timeline