MFC r258800, r258802, r258805, r258806, r258807, r258851, r258857,

    r259199, r259484, r259513, r259514, r259516

  The kernel stack guard pages are only below the stack pointer, not above.

  Remove unnecessary double-setting of the thread's onfault state in
  copyinstr().

  Open Firmware mandates that certain cross-references, in particular those
  in /chosen, be ihandles. The ePAPR spec makes those cross-reference phandles,
  since FDT has no concept of ihandles. Have the OF FDT CI module interpret
  queries about ihandles as cross-reference phandles.

  Real OF systems have an ihandle under /chosen/stdout, not a phandle. Use
  the right type.

  Rearchitect platform memory map parsing to make it less
  Open Firmware-centric.

  Remove fdtbus_bs_tag definition, which is now obsolete. The remainder of
  this file is also slated for future demolition.

  Return the correct IEEE 1275 code for "nextprop".

  Use the common Open Firmware PCI interrupt routing code instead of the
  duplicate version in dev/fdt.

  Configure interrupt sense based on device tree information.

  Simplify the ofw_bus_lookup_imap() API slightly: make it allocate maskbuf
  internally instead of requiring the caller to allocate it.

1 files changed, 2 insertions, 2 deletions

diff --git a/sys/dev/uart/uart_cpu_powerpc.c b/sys/dev/uart/uart_cpu_powerpc.c
index 44f6338..0791c77 100644
--- a/sys/dev/uart/uart_cpu_powerpc.c
+++ b/sys/dev/uart/uart_cpu_powerpc.c
@@ -89,13 +89,13 @@ ofw_get_console_phandle_path(phandle_t node, phandle_t *result,
 		return (ENXIO);
 	OF_getprop(node, prop, &field, sizeof(field));
 
-	/* This property might be a phandle or might be a path. Hooray. */
+	/* This property might be either a ihandle or path. Hooray. */
 
 	output = -1;
 	if (field.buf[size - 1] == 0)
 		output = OF_finddevice(field.buf);
 	if (output == -1 && size == 4)
-		output = OF_xref_phandle(field.ref);
+		output = OF_instance_to_package(field.ref);
 	
 	if (output != -1) {
 		*result = output;