Merge commit 'v2.6.36-rc3' into x86/memblock
[linux-3.10.git] / arch / powerpc / kernel / paca.c
index d0a26f1..a4e7215 100644 (file)
@@ -127,7 +127,7 @@ void __init allocate_pacas(void)
         * the first segment. On iSeries they must be within the area mapped
         * by the HV, which is HvPagesToMap * HVPAGESIZE bytes.
         */
-       limit = min(0x10000000ULL, memblock.rmo_size);
+       limit = min(0x10000000ULL, ppc64_rma_size);
        if (firmware_has_feature(FW_FEATURE_ISERIES))
                limit = min(limit, HvPagesToMap * HVPAGESIZE);