summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJes Sorensen <jes@sgi.com>2008-06-24 11:30:09 -0400
committerTony Luck <tony.luck@intel.com>2008-06-24 10:16:27 -0700
commit2826f8c0f4c97b7db33e2a680f184d828eb7a785 (patch)
treec311c40baee4e4231e08538eccfeefbf2e08f208
parent62786b9e81a2dbe9c073a2ade52d33a2627d6d85 (diff)
downloadlinux-2826f8c0f4c97b7db33e2a680f184d828eb7a785.tar.gz
linux-2826f8c0f4c97b7db33e2a680f184d828eb7a785.tar.bz2
linux-2826f8c0f4c97b7db33e2a680f184d828eb7a785.zip
[IA64] Fix boot failure on ia64/sn2
Call check_sal_cache_flush() after platform_setup() as check_sal_cache_flush() now relies on being able to call platform vector code. Problem was introduced by: 3463a93def55c309f3c0d0a8aaf216be3be42d64 "Update check_sal_cache_flush to use platform_send_ipi()" Signed-off-by: Jes Sorensen <jes@sgi.com> Tested-by: Alex Chiang: <achiang@hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--arch/ia64/kernel/setup.c3
1 files changed, 1 insertions, 2 deletions
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();
}