D46490.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D46490.id.diff
View Options

	diff --git a/sys/dev/uart/uart_cpu_acpi.c b/sys/dev/uart/uart_cpu_acpi.c
	--- a/sys/dev/uart/uart_cpu_acpi.c
	+++ b/sys/dev/uart/uart_cpu_acpi.c
	@@ -235,10 +235,10 @@

	error = ENXIO;

	- dbg2_dev = (ACPI_DBG2_DEVICE *)((vm_offset_t)dbg2 + dbg2->InfoOffset);
	+ dbg2_dev = (ACPI_DBG2_DEVICE *)((uintptr_t)dbg2 + dbg2->InfoOffset);
	found = false;
	- while ((vm_offset_t)dbg2_dev + dbg2_dev->Length <=
	- (vm_offset_t)dbg2 + dbg2->Header.Length) {
	+ while ((uintptr_t)dbg2_dev + dbg2_dev->Length <=
	+ (uintptr_t)dbg2 + dbg2->Header.Length) {
	if (dbg2_dev->PortType != ACPI_DBG2_SERIAL_PORT)
	goto next;

	@@ -252,7 +252,7 @@

	class = cd->cd_class;
	base_address = (ACPI_GENERIC_ADDRESS *)
	- ((vm_offset_t)dbg2_dev + dbg2_dev->BaseAddressOffset);
	+ ((uintptr_t)dbg2_dev + dbg2_dev->BaseAddressOffset);

	error = uart_cpu_acpi_init_devinfo(di, class, base_address);
	if (error == 0) {
	@@ -262,7 +262,7 @@

	next:
	dbg2_dev = (ACPI_DBG2_DEVICE *)
	- ((vm_offset_t)dbg2_dev + dbg2_dev->Length);
	+ ((uintptr_t)dbg2_dev + dbg2_dev->Length);
	}
	if (!found)
	goto out;