Merge branch 'fixes' into next

[linux-2.6-microblaze.git] / arch / powerpc / platforms / pseries / setup.c

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index ee4f1db..a74c425 100644 (file)
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -72,6 +72,7 @@
 #include <asm/svm.h>
 #include <asm/dtl.h>
 #include <asm/hvconsole.h>
+#include <asm/setup.h>
 
 #include "pseries.h"
 
@@ -802,9 +803,8 @@ static void __init pSeries_setup_arch(void)
        fwnmi_init();
 
        pseries_setup_security_mitigations();
-#ifdef CONFIG_PPC_64S_HASH_MMU
-       pseries_lpar_read_hblkrm_characteristics();
-#endif
+       if (!radix_enabled())
+               pseries_lpar_read_hblkrm_characteristics();
 
        /* By default, only probe PCI (can be overridden by rtas_pci) */
        pci_add_flags(PCI_PROBE_ONLY);