3 files changed, 8 insertions, 1 deletions

diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index b3c2e2c26743..a9bf5f222e47 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -1096,6 +1096,7 @@ static void smp_tune_scheduling (void)
                         cachesize = 16; /* Pentiums, 2x8kB cache */
                         bandwidth = 100;
                 }
+                max_cache_size = cachesize * 1024;
         }
 }
 
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index d91c8ff2c0d7..0daa8fa9ef32 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -696,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;
@@ -725,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,
@@ -741,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;
 }
diff --git a/arch/ppc/xmon/xmon.c b/arch/ppc/xmon/xmon.c
index 2b483b4f1602..9075a7538e26 100644
--- a/arch/ppc/xmon/xmon.c
+++ b/arch/ppc/xmon/xmon.c
@@ -99,7 +99,7 @@ static void remove_bpts(void);
 static void insert_bpts(void);
 static struct bpt *at_breakpoint(unsigned pc);
 static void bpt_cmds(void);
-static void cacheflush(void);
+void cacheflush(void);
 #ifdef CONFIG_SMP
 static void cpu_cmd(void);
 #endif /* CONFIG_SMP */