2 files changed, 1 insertions, 4 deletions

diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index 082c31dcfd99..39752cdef6ff 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -558,8 +558,6 @@ static struct iosapic_rte_info * __init_refok iosapic_alloc_rte (void)
         if (!iosapic_kmalloc_ok && list_empty(&free_rte_list)) {
                 rte = alloc_bootmem(sizeof(struct iosapic_rte_info) *
                                     NR_PREALLOCATE_RTE_ENTRIES);
-                if (!rte)
-                        return NULL;
                 for (i = 0; i < NR_PREALLOCATE_RTE_ENTRIES; i++, rte++)
                         list_add(&rte->rte_list, &free_rte_list);
         }
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index f48a809c686d..4ae15c8c2488 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -578,8 +578,6 @@ setup_arch (char **cmdline_p)
         cpu_init();     /* initialize the bootstrap CPU */
         mmu_context_init();     /* initialize context_id bitmap */
 
-        check_sal_cache_flush();
-
 #ifdef CONFIG_ACPI
         acpi_boot_init();
 #endif
@@ -607,6 +605,7 @@ setup_arch (char **cmdline_p)
                 ia64_mca_init();
 
         platform_setup(cmdline_p);
+        check_sal_cache_flush();
         paging_init();
 }