diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2016-07-05 15:04:00 +1000 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-21 18:59:22 +1000 |
commit | 406b0b6ae3fcd5c7946a68a9e43b470c79d292a2 (patch) | |
tree | 6d6ee917303ebae7cf3fd1b551778883e3941d3b /arch/powerpc/platforms/cell/setup.c | |
parent | 84b62c72faa197a5c9b75ee93527add31695fb32 (diff) | |
download | linux-stable-406b0b6ae3fcd5c7946a68a9e43b470c79d292a2.tar.gz linux-stable-406b0b6ae3fcd5c7946a68a9e43b470c79d292a2.tar.bz2 linux-stable-406b0b6ae3fcd5c7946a68a9e43b470c79d292a2.zip |
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/cell/setup.c')
-rw-r--r-- | arch/powerpc/platforms/cell/setup.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c index e342f7833db5..d3543e68efe8 100644 --- a/arch/powerpc/platforms/cell/setup.c +++ b/arch/powerpc/platforms/cell/setup.c @@ -255,10 +255,8 @@ static void __init cell_setup_arch(void) static int __init cell_probe(void) { - unsigned long root = of_get_flat_dt_root(); - - if (!of_flat_dt_is_compatible(root, "IBM,CBEA") && - !of_flat_dt_is_compatible(root, "IBM,CPBW-1.0")) + if (!of_machine_is_compatible("IBM,CBEA") && + !of_machine_is_compatible("IBM,CPBW-1.0")) return 0; pm_power_off = rtas_power_off; |