]> err.no Git - linux-2.6/commitdiff
[IA64] Shrink shadow_flush_counts to a short array to save 8k of per_cpu area.
authorRobin Holt <holt@sgi.com>
Fri, 15 Aug 2008 14:21:24 +0000 (09:21 -0500)
committerTony Luck <tony.luck@intel.com>
Mon, 18 Aug 2008 22:39:48 +0000 (15:39 -0700)
Making allmodconfig will break the current build.  This patch shrinks
the per_cpu__shadow_flush_counts from 16k to 8k which frees enough space
to allow allmodconfig to successfully complete.

Fixes http://bugzilla.kernel.org/show_bug.cgi?id=11338

Signed-off-by: Robin Holt <holt@sgi.com>
Acked-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/kernel/smp.c

index 3676468612b607fbfacbd4447941b1e1253cea48..da8f020d82c1f5acb7e20fc2dd6ef4a1b8d86333 100644 (file)
@@ -58,7 +58,7 @@ static struct local_tlb_flush_counts {
        unsigned int count;
 } __attribute__((__aligned__(32))) local_tlb_flush_counts[NR_CPUS];
 
-static DEFINE_PER_CPU(unsigned int, shadow_flush_counts[NR_CPUS]) ____cacheline_aligned;
+static DEFINE_PER_CPU(unsigned short, shadow_flush_counts[NR_CPUS]) ____cacheline_aligned;
 
 #define IPI_CALL_FUNC          0
 #define IPI_CPU_STOP           1
@@ -254,7 +254,7 @@ smp_local_flush_tlb(void)
 void
 smp_flush_tlb_cpumask(cpumask_t xcpumask)
 {
-       unsigned int *counts = __ia64_per_cpu_var(shadow_flush_counts);
+       unsigned short *counts = __ia64_per_cpu_var(shadow_flush_counts);
        cpumask_t cpumask = xcpumask;
        int mycpu, cpu, flush_mycpu = 0;
 
@@ -262,7 +262,7 @@ smp_flush_tlb_cpumask(cpumask_t xcpumask)
        mycpu = smp_processor_id();
 
        for_each_cpu_mask(cpu, cpumask)
-               counts[cpu] = local_tlb_flush_counts[cpu].count;
+               counts[cpu] = local_tlb_flush_counts[cpu].count & 0xffff;
 
        mb();
        for_each_cpu_mask(cpu, cpumask) {
@@ -276,7 +276,7 @@ smp_flush_tlb_cpumask(cpumask_t xcpumask)
                smp_local_flush_tlb();
 
        for_each_cpu_mask(cpu, cpumask)
-               while(counts[cpu] == local_tlb_flush_counts[cpu].count)
+               while(counts[cpu] == (local_tlb_flush_counts[cpu].count & 0xffff))
                        udelay(FLUSH_DELAY);
 
        preempt_enable();