These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / powerpc / kernel / paca.c

diff --git a/kernel/arch/powerpc/kernel/paca.c b/kernel/arch/powerpc/kernel/paca.c
index 5a23b69..01ea0ed 100644 (file)
--- a/kernel/arch/powerpc/kernel/paca.c
+++ b/kernel/arch/powerpc/kernel/paca.c
@@ -204,14 +204,19 @@ static int __initdata paca_size;
 
 void __init allocate_pacas(void)
 {
-       int cpu, limit;
+       u64 limit;
+       int cpu;
 
+       limit = ppc64_rma_size;
+
+#ifdef CONFIG_PPC_BOOK3S_64
        /*
         * We can't take SLB misses on the paca, and we want to access them
         * in real mode, so allocate them within the RMA and also within
         * the first segment.
         */
-       limit = min(0x10000000ULL, ppc64_rma_size);
+       limit = min(0x10000000ULL, limit);
+#endif
 
        paca_size = PAGE_ALIGN(sizeof(struct paca_struct) * nr_cpu_ids);