diff options
| author | peter <peter@FreeBSD.org> | 2003-11-14 22:26:29 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2003-11-14 22:26:29 +0000 |
| commit | a04c723d6a3747990b7de056e7467416da62a65b (patch) | |
| tree | ccaeb391559b89017343291446121cbaf1d4d7e8 /sys/i386/acpica | |
| parent | bd6ac1d6e550237d7d2aa9a220261fdd16be1147 (diff) | |
| download | FreeBSD-src-a04c723d6a3747990b7de056e7467416da62a65b.zip FreeBSD-src-a04c723d6a3747990b7de056e7467416da62a65b.tar.gz | |
Minor source sync with amd64. For %.*s printf formats, pass in an
int rather than a size_t. cast the ioapicaddress variable via
uintptr_t before going to void *.
Diffstat (limited to 'sys/i386/acpica')
| -rw-r--r-- | sys/i386/acpica/madt.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/i386/acpica/madt.c b/sys/i386/acpica/madt.c index 2ac73e5..71be5ba 100644 --- a/sys/i386/acpica/madt.c +++ b/sys/i386/acpica/madt.c @@ -200,7 +200,9 @@ madt_probe(void) */ if (AcpiOsGetRootPointer(ACPI_LOGICAL_ADDRESSING, &rsdp_ptr) != AE_OK) return (ENXIO); +#ifdef __i386__ KASSERT(rsdp_ptr.Pointer.Physical < KERNLOAD, ("RSDP too high")); +#endif rsdp = pmap_mapdev(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR)); if (rsdp == NULL) { if (bootverbose) @@ -308,8 +310,8 @@ madt_setup_local(void) madt = pmap_mapdev(madt_physaddr, madt_length); lapic_init((uintptr_t)madt->LocalApicAddress); printf("ACPI APIC Table: <%.*s %.*s>\n", - sizeof(madt->Header.OemId), madt->Header.OemId, - sizeof(madt->Header.OemTableId), madt->Header.OemTableId); + (int)sizeof(madt->Header.OemId), madt->Header.OemId, + (int)sizeof(madt->Header.OemTableId), madt->Header.OemTableId); /* * We ignore 64-bit local APIC override entries. Should we @@ -419,7 +421,7 @@ madt_parse_apics(APIC_HEADER *entry, void *arg __unused) if (bootverbose) printf("MADT: Found IO APIC ID %d, Vector %d at %p\n", apic->IoApicId, apic->Vector, - (void *)apic->IoApicAddress); + (void *)(uintptr_t)apic->IoApicAddress); if (apic->IoApicId >= NIOAPICS) panic("%s: I/O APIC ID %d too high", __func__, apic->IoApicId); |
