Skip to contentSkip to conversation

2.6.9-mm1-U10.3 : compile error fix with CONFIG_HOTPLUG_CPU enable

PATCH Remi Colinet 1 participant 1 message Oct 22, 2004

lore
Share & tools
lore
#0 lore raw

Hi

With CONFIG_HOTPLUG_CPU and CONFIG_SMP enable, this patch fixes the following compile error.

swap.c 2004-10-22 23:10:44.202728352 +0200 renamed from swap.c.orig 2004-10-22 22:31:58.000000000 +0200 +0 -0
@@ -423,12 +423,12 @@

#ifdef CONFIG_HOTPLUG_CPU
static void lru_drain_cache(unsigned int cpu)
{
- struct pagevec *pvec = &per_cpu(lru_add_pvecs, cpu);
+ struct pagevec *pvec = &per_cpu_var_locked(lru_add_pvecs, cpu);

       /* CPU is dead, so no locking needed. */
       if (pagevec_count(pvec))
               __pagevec_lru_add(pvec);
-       pvec = &per_cpu(lru_add_active_pvecs, cpu);
+       pvec = &per_cpu_var_locked(lru_add_active_pvecs, cpu);
       if (pagevec_count(pvec))
               __pagevec_lru_add_active(pvec);
}
 CC      mm/page_alloc.o
 CC      mm/page-writeback.o
 CC      mm/pdflush.o
 CC      mm/prio_tree.o
 CC      mm/readahead.o
 CC      mm/slab.o
 CC      mm/swap.o

mm/swap.c: In function `lru_drain_cache':
mm/swap.c:426: `per_cpu__lru_add_pvecs' undeclared (first use in this function) mm/swap.c:426: (Each undeclared identifier is reported only once mm/swap.c:426: for each function it appears in.)
mm/swap.c:426: warning: type defaults to int' in declaration of type name' mm/swap.c:426: invalid type argument of `unary *'
mm/swap.c:431: per_cpu__lru_add_active_pvecs' undeclared (first use in this function) mm/swap.c:431: warning: type defaults to int' in declaration of type name' mm/swap.c:431: invalid type argument of unary *'
make[1]: *** [mm/swap.o] Error 1
make: *** [mm] Error 2

Remi