diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2016-07-05 08:04:00 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-21 11:59:22 +0300 |
| commit | 406b0b6ae3fcd5c7946a68a9e43b470c79d292a2 (patch) | |
| tree | 6d6ee917303ebae7cf3fd1b551778883e3941d3b /arch/powerpc/platforms/powernv | |
| parent | 84b62c72faa197a5c9b75ee93527add31695fb32 (diff) | |
| download | linux-406b0b6ae3fcd5c7946a68a9e43b470c79d292a2.tar.xz | |
powerpc/64: Move 64-bit probe_machine() to later in the boot process
We no long need the machine type that early, so we can move probe_machine()
to after the device-tree has been expanded. This will allow further
consolidation.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/platforms/powernv')
| -rw-r--r-- | arch/powerpc/platforms/powernv/setup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c index f70ea83502b2..8865efa54e51 100644 --- a/arch/powerpc/platforms/powernv/setup.c +++ b/arch/powerpc/platforms/powernv/setup.c @@ -268,9 +268,7 @@ static void __init pnv_setup_machdep_opal(void) static int __init pnv_probe(void) { - unsigned long root = of_get_flat_dt_root(); - - if (!of_flat_dt_is_compatible(root, "ibm,powernv")) + if (!of_machine_is_compatible("ibm,powernv")) return 0; if (firmware_has_feature(FW_FEATURE_OPAL)) |