| From | Greg Kroah-Hartman <> | Subject | [ 16/59] sparc64 address-congruence property | Date | Fri, 26 Jul 2013 13:52:40 -0700 |
| |
3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: bob picco <bpicco@meloft.net>
The Machine Description (MD) property "address-congruence-offset" is optional. According to the MD specification the value is assumed 0UL when not present. This caused early boot failure on T5.
Signed-off-by: Bob Picco <bob.picco@oracle.com> CC: sparclinux@vger.kernel.org Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- arch/sparc/mm/init_64.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
--- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -1067,7 +1067,14 @@ static int __init grab_mblocks(struct md m->size = *val; val = mdesc_get_property(md, node, "address-congruence-offset", NULL); - m->offset = *val; + + /* The address-congruence-offset property is optional. + * Explicity zero it be identifty this. + */ + if (val) + m->offset = *val; + else + m->offset = 0UL; numadbg("MBLOCK[%d]: base[%llx] size[%llx] offset[%llx]\n", count - 1, m->base, m->size, m->offset);
|