Re: 2.6.24-rc7-rt1: macro "put_cpu_var" passed 2 arguments, but takes just 1

[Mariusz Kozlowski <m.kozlowski@tuxland.pl>]

Hello,

> We are pleased to announce the 2.6.24-rc7-rt1 tree, which can be
> downloaded from the location:
> 
>   http://rt.et.redhat.com/download/

  CC      arch/x86/mm/init_32.o
In file included from include/asm-generic/tlb.h:17,
                 from include/asm/tlb.h:9,
                 from arch/x86/mm/init_32.c:43:
include/linux/quicklist.h:73:28: error: macro "put_cpu_var" passed 2 arguments, but takes just 1
In file included from include/asm-generic/tlb.h:17,
                 from include/asm/tlb.h:9,
                 from arch/x86/mm/init_32.c:43:
include/linux/quicklist.h: In function '__quicklist_free':
include/linux/quicklist.h:73: error: 'put_cpu_var' undeclared (first use in this function)
include/linux/quicklist.h:73: error: (Each undeclared identifier is reported only once
include/linux/quicklist.h:73: error: for each function it appears in.)
make[1]: *** [arch/x86/mm/init_32.o] Error 1
make: *** [arch/x86/mm] Error 2

--- linux-2.6.24-rc7-rt1.orig/include/linux/quicklist.h 2008-01-11 21:16:22.000000000 -0500
+++ linux-2.6.24-rc7-rt1/include/linux/quicklist.h      2008-01-11 21:18:08.000000000 -0500
@@ -18,7 +18,7 @@ struct quicklist {
        int nr_pages;
 };

[... snip ...]

@@ -56,12 +64,13 @@ static inline void __quicklist_free(int 
        struct page *page)
 {
        struct quicklist *q;
+       int cpu;

-       q = &get_cpu_var(quicklist)[nr];
+       q = &get_cpu_var_locked(quicklist, &cpu)[nr];
        *(void **)p = q->page;
        q->page = p;
        q->nr_pages++;
-       put_cpu_var(quicklist);
+       put_cpu_var(quicklist, cpu); <------------- should that be put_cpu_var_locked()?
 }

Regards,

	Mariusz