diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-11-10 16:08:33 +1100 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2015-11-10 17:23:47 -0600 |
| commit | 85a1c77fb8c4ae91d203fd0e8c3b54b50662d3c6 (patch) | |
| tree | 3b18107cf712bce30542eae4bc43764e23cff0ed /drivers | |
| parent | 87ab5205e620f0936f5c65c9d6c7b341dca9d5f9 (diff) | |
| download | op-kernel-dev-85a1c77fb8c4ae91d203fd0e8c3b54b50662d3c6.zip op-kernel-dev-85a1c77fb8c4ae91d203fd0e8c3b54b50662d3c6.tar.gz | |
of: Print rather than WARN'ing when overlap check fails
__rmem_check_for_overlap() is called very early in boot, and on some
powerpc systems it's not safe to call WARN that early in boot.
If the overlap check fails the system will oops instead of printing a
warning. Furthermore because it's so early in boot the console is not up
and the user doesn't see the oops, they just get a dead system.
Fix it by printing an error instead of calling WARN.
Fixes: ae1add247bf8 ("of: Check for overlap in reserved memory regions")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/of_reserved_mem.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 62f467b..4970391 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -226,10 +226,9 @@ static void __init __rmem_check_for_overlap(void) this_end = this->base + this->size; next_end = next->base + next->size; - WARN(1, - "Reserved memory: OVERLAP DETECTED!\n%s (%pa--%pa) overlaps with %s (%pa--%pa)\n", - this->name, &this->base, &this_end, - next->name, &next->base, &next_end); + pr_err("Reserved memory: OVERLAP DETECTED!\n%s (%pa--%pa) overlaps with %s (%pa--%pa)\n", + this->name, &this->base, &this_end, + next->name, &next->base, &next_end); } } } |
