UBUNTU: SAUCE: powerpc/pseries: Increase RMA size to 512MB.

BugLink: http://bugs.launchpad.net/bugs/1614309
When trying to boot large kernel and initrd images on large systems
(with hundreds of CPUs and Terabytes of memory), we sometimes run out
of memory for the flattened device tree (FDT).

Increase the memory allocated for the Real Mode Area (RMA) to 512MB to
allow more room for the FDT.

Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Conflicts:
	arch/powerpc/kernel/prom_init.c

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index ac83eb04a8b871293c53e7bd6ff4d439b89704a9..46d2a2c2add6d4869cd4d531102156e6901f1978 100644 (file)
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -786,7 +786,7 @@ struct ibm_arch_vec __cacheline_aligned ibm_architecture_vec = {
                .virt_base = cpu_to_be32(0xffffffff),
                .virt_size = cpu_to_be32(0xffffffff),
                .load_base = cpu_to_be32(0xffffffff),
-               .min_rma = cpu_to_be32(256),            /* 256MB min RMA */
+               .min_rma = cpu_to_be32(512),            /* 512MB min RMA */
                .min_load = cpu_to_be32(0xffffffff),    /* full client load */
                .min_rma_percent = 0,   /* min RMA percentage of total RAM */
                .max_pft_size = 48,     /* max log_2(hash table size) */