1 files changed, 17 insertions, 1 deletions

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index c33305d8e5eb..c0766575a3a2 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -60,6 +60,7 @@
 #include <asm/smp.h>
 #include <asm/system.h>
 #include <asm/unistd.h>
+#include <asm/system.h>
 
 #if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE)
 # error "struct cpuinfo_ia64 too big!"
@@ -695,6 +696,7 @@ static void
 get_max_cacheline_size (void)
 {
         unsigned long line_size, max = 1;
+        unsigned int cache_size = 0;
         u64 l, levels, unique_caches;
         pal_cache_config_info_t cci;
         s64 status;
@@ -724,6 +726,8 @@ get_max_cacheline_size (void)
                 line_size = 1 << cci.pcci_line_size;
                 if (line_size > max)
                         max = line_size;
+                if (cache_size < cci.pcci_cache_size)
+                        cache_size = cci.pcci_cache_size;
                 if (!cci.pcci_unified) {
                         status = ia64_pal_cache_config_info(l,
                                                     /* cache_type (instruction)= */ 1,
@@ -740,6 +744,9 @@ get_max_cacheline_size (void)
                         ia64_i_cache_stride_shift = cci.pcci_stride;
         }
   out:
+#ifdef CONFIG_SMP
+        max_cache_size = max(max_cache_size, cache_size);
+#endif
         if (max > ia64_max_cacheline_size)
                 ia64_max_cacheline_size = max;
 }
@@ -794,7 +801,7 @@ cpu_init (void)
 #endif
 
         /* Clear the stack memory reserved for pt_regs: */
-        memset(ia64_task_regs(current), 0, sizeof(struct pt_regs));
+        memset(task_pt_regs(current), 0, sizeof(struct pt_regs));
 
         ia64_set_kr(IA64_KR_FPU_OWNER, 0);
 
@@ -870,6 +877,15 @@ cpu_init (void)
         pm_idle = default_idle;
 }
 
+/*
+ * On SMP systems, when the scheduler does migration-cost autodetection,
+ * it needs a way to flush as much of the CPU's caches as possible.
+ */
+void sched_cacheflush(void)
+{
+        ia64_sal_cache_flush(3);
+}
+
 void
 check_bugs (void)
 {