diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2020-05-26 14:56:03 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-05-26 14:56:03 +0200 |
| commit | baddc87d6824cda18037881352fe97382fdb0867 (patch) | |
| tree | 7f10a8c28df8136841cae359ded4c321cb1a81ad /arch/powerpc/kernel/setup_64.c | |
| parent | Merge "Use hugepages to map kernel mem on 8xx" into next (diff) | |
| parent | powerpc/64s: Fix restore of NV GPRs after facility unavailable exception (diff) | |
| download | linux-baddc87d6824cda18037881352fe97382fdb0867.tar.xz linux-baddc87d6824cda18037881352fe97382fdb0867.zip | |
Merge branch 'fixes' into next
Merge our fixes branch from this cycle. It contains several important
fixes we need in next for testing purposes, and also some that will
conflict with upcoming changes.
Diffstat (limited to 'arch/powerpc/kernel/setup_64.c')
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index defe05b6b7a9..bb47555d48a2 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -534,6 +534,8 @@ static bool __init parse_cache_info(struct device_node *np, lsizep = of_get_property(np, propnames[3], NULL); if (bsizep == NULL) bsizep = lsizep; + if (lsizep == NULL) + lsizep = bsizep; if (lsizep != NULL) lsize = be32_to_cpu(*lsizep); if (bsizep != NULL) |