Re: 2.6.14-mm1

[Benoit Boissinot <bboissin@gmail.com>]

On 11/7/05, Reuben Farrelly <reuben-lkml@reub.net> wrote:
> Hi,
>
> Ok a couple of things so far:
>
> Firstly:
>
> CC [M]  drivers/edac/edac_mc.o
> drivers/edac/edac_mc.c: In function 'edac_mc_scrub_block':
> drivers/edac/edac_mc.c:647: error: syntax error before 'asm'
> drivers/edac/edac_mc.c:647: error: void value not ignored as it ought to be
> drivers/edac/edac_mc.c:653: warning: passing argument 1 of 'page_zone' makes
> pointer from integer without a cast
> drivers/edac/edac_mc.c:653: error: syntax error before 'do'
> drivers/edac/edac_mc.c:653: error: '__dummy' undeclared (first use in this function)
> drivers/edac/edac_mc.c:653: error: (Each undeclared identifier is reported only once
> drivers/edac/edac_mc.c:653: error: for each function it appears in.)
> drivers/edac/edac_mc.c: At top level:
> drivers/edac/edac_mc.c:653: error: syntax error before 'while'
> make[2]: *** [drivers/edac/edac_mc.o] Error 1
> make[1]: *** [drivers/edac] Error 2
> make: *** [drivers] Error 2
>
The following patch fixes it

Signed-Off-By: Benoit Boissinot <benoit.boissinot@ens-lyon.org>

Index: linux/include/linux/highmem.h
===================================================================
--- linux.orig/include/linux/highmem.h
+++ linux/include/linux/highmem.h
@@ -21,7 +21,7 @@ unsigned int nr_free_highpages(void);
  */
 #define kmap_atomic_maybe_irqsave(page, idx, flags)		\
 	({						\
-		if (PageHighMem(page)			\
+		if (PageHighMem(page))			\
 			local_irq_save(flags);		\
 		kmap_atomic(page, idx);			\
 	})
@@ -29,7 +29,7 @@ unsigned int nr_free_highpages(void);
 #define kunmap_atomic_maybe_irqrestore(addr, idx, flags)		\
 	({						\
 		kunmap_atomic(addr, idx);		\
-		if (PageHighMem(page)			\
+		if (PageHighMem(page))			\
 			local_irq_restore(flags);	\
 	})