MFC r258268, r258271, r258272, r258274, r258275, r258427, r258694, r258696,

    r258697, r258757

  Do not assume a value for #address-cells when parsing the OF translations
  map. This allows the kernel to get farther with OpenBIOS on 64-bit CPUs.

  Actually look up #address-cells instead of assuming it is correlated with
  the Uninorth version number.

  #interrupt-cells belongs to the iparent, not the device parent.

  Add a sysctl to allow disabling resetting the OF syscons.

  For PCI<->PCI bridges, #address-cells may be 3.

  Make RTAS calls, which call setfault() to recover from machine checks,
  preserve any existing fault buffer.

  badaddr() is used only in the grackle PCI driver, so move its definition
  there. Clean up a spurious setfault() declaration as well.

  This [phyp_console] driver doesn't need the /options node, so don't check
  for it.

  Use the Open Firmware-based CPU frequency determination as a generic
  fallback if we can't measure CPU frequency. This is also useful on a
  variety of embedded systems using FDT.

1 files changed, 1 insertions, 3 deletions

diff --git a/sys/powerpc/pseries/phyp_console.c b/sys/powerpc/pseries/phyp_console.c
index 2434697..79d9094 100644
--- a/sys/powerpc/pseries/phyp_console.c
+++ b/sys/powerpc/pseries/phyp_console.c
@@ -192,11 +192,9 @@ uart_phyp_cnprobe(struct consdev *cp)
 {
 	char buf[64];
 	ihandle_t stdout;
-	phandle_t input, opts, chosen;
+	phandle_t input, chosen;
 	static struct uart_phyp_softc sc;
 
-	if ((opts = OF_finddevice("/options")) == -1)
-		goto fail;
 	if ((chosen = OF_finddevice("/chosen")) == -1)
 		goto fail;