From 56eb36996aa570432a06e77605c9fc75737ee56d Mon Sep 17 00:00:00 2001
From: Troy Heber <troy.heber@hp.com>
Date: Wed, 25 Oct 2006 14:46:15 -0600
Subject: [PATCH] --- yaml --- r: 40565 b: refs/heads/master c:
 fa1d19e5d9a94120f31e5783ab44758f46892d94 h: refs/heads/master i:   40563:
 94873eb2c7cc1dd29b4c350422bc510686db1fd1 v: v3

---
 [refs]                         |  2 +-
 trunk/arch/ia64/kernel/sal.c   | 11 +++++++----
 trunk/arch/ia64/kernel/setup.c |  2 ++
 trunk/include/asm-ia64/sal.h   |  1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 497f03db4a35..a4c8cb5aa05f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 264b0f99308436deaee38bab99e586612d012fc1
+refs/heads/master: fa1d19e5d9a94120f31e5783ab44758f46892d94
diff --git a/trunk/arch/ia64/kernel/sal.c b/trunk/arch/ia64/kernel/sal.c
index 642fdc7b969d..20bad78b5073 100644
--- a/trunk/arch/ia64/kernel/sal.c
+++ b/trunk/arch/ia64/kernel/sal.c
@@ -223,12 +223,13 @@ static void __init sal_desc_ap_wakeup(void *p) { }
  */
 static int sal_cache_flush_drops_interrupts;
 
-static void __init
+void __init
 check_sal_cache_flush (void)
 {
 	unsigned long flags;
 	int cpu;
-	u64 vector;
+	u64 vector, cache_type = 3;
+	struct ia64_sal_retval isrv;
 
 	cpu = get_cpu();
 	local_irq_save(flags);
@@ -243,7 +244,10 @@ check_sal_cache_flush (void)
 	while (!ia64_get_irr(IA64_TIMER_VECTOR))
 		cpu_relax();
 
-	ia64_sal_cache_flush(3);
+	SAL_CALL(isrv, SAL_CACHE_FLUSH, cache_type, 0, 0, 0, 0, 0, 0);
+
+	if (isrv.status)
+		printk(KERN_ERR "SAL_CAL_FLUSH failed with %ld\n", isrv.status);
 
 	if (ia64_get_irr(IA64_TIMER_VECTOR)) {
 		vector = ia64_get_ivr();
@@ -331,7 +335,6 @@ ia64_sal_init (struct ia64_sal_systab *systab)
 		p += SAL_DESC_SIZE(*p);
 	}
 
-	check_sal_cache_flush();
 }
 
 int
diff --git a/trunk/arch/ia64/kernel/setup.c b/trunk/arch/ia64/kernel/setup.c
index c4caa8003492..d10404a41756 100644
--- a/trunk/arch/ia64/kernel/setup.c
+++ b/trunk/arch/ia64/kernel/setup.c
@@ -457,6 +457,8 @@ 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
diff --git a/trunk/include/asm-ia64/sal.h b/trunk/include/asm-ia64/sal.h
index 0b210abbe003..d000689d9142 100644
--- a/trunk/include/asm-ia64/sal.h
+++ b/trunk/include/asm-ia64/sal.h
@@ -659,6 +659,7 @@ ia64_sal_freq_base (unsigned long which, unsigned long *ticks_per_second,
 }
 
 extern s64 ia64_sal_cache_flush (u64 cache_type);
+extern void __init check_sal_cache_flush (void);
 
 /* Initialize all the processor and platform level instruction and data caches */
 static inline s64