[Xen-ia64-devel] [RFC][Patch] complie error at kmap_flush_unused in include/linux/highmem.h

[Akio Takebe <takebe_akio@xxxxxxxxxxxxxx>]

Hi,

blkback.c has the following compile error.
I don't know why this error is occurred.
This error is sometimes occurred when I run "make world".

This error caused by redifine kmap_flush_unused 
in include/linux/highmem.h and include/asm-ia64/hypervisor.h.
I tried to remove difine kmap_flush_unused 
in include/asm-ia64/hypervisor.h, then it is good.
Am I correct?

The bellow is the compile error.
===========================================
  LOGO  drivers/video/logo/logo_mac_clut224.c
  LOGO  drivers/video/logo/logo_parisc_clut224.c
  LOGO  drivers/video/logo/logo_sgi_clut224.c
  LOGO  drivers/video/logo/logo_sun_clut224.c
  LOGO  drivers/video/logo/logo_superh_clut224.c
  CC      drivers/video/fbmem.o
  CC      drivers/video/fbmon.o
  CC      drivers/video/fbcmap.o
  CC      drivers/video/fbsysfs.o
  CC      drivers/video/modedb.o
  CC      drivers/video/fbcvt.o
  LD      drivers/video/fb.o
  CC      drivers/video/cfbfillrect.o
  CC      drivers/video/cfbcopyarea.o
  CC      drivers/video/cfbimgblt.o
  LD      drivers/video/built-in.o
  CC      drivers/xen/util.o
  CC      drivers/xen/blkback/blkback.o
In file included from include/linux/pagemap.h:10,
                 from include/linux/blkdev.h:10,
                 from drivers/xen/blkback/common.h:10,
                 from drivers/xen/blkback/blkback.c:19:
include/linux/highmem.h:24:42: macro "kmap_flush_unused" passed 1 
arguments, but takes just 0
In file included from include/linux/pagemap.h:10,
                 from include/linux/blkdev.h:10,
                 from drivers/xen/blkback/common.h:10,
                 from drivers/xen/blkback/blkback.c:19:
include/linux/highmem.h:24: error: syntax error before '{' token
drivers/xen/blkback/blkback.c: In function `blkif_init':
drivers/xen/blkback/blkback.c:528: warning: implicit declaration of 
function `xen_init'
drivers/xen/blkback/blkback.c:550: warning: ISO C90 forbids mixed 
declarations and code
drivers/xen/blkback/blkback.c:525: warning: unused variable `page'
make[7]: *** [drivers/xen/blkback/blkback.o] Error 1
make[6]: *** [drivers/xen/blkback] Error 2
make[5]: *** [drivers/xen] Error 2
make[4]: *** [drivers] Error 2
make[4]: Leaving directory `/home/takebe/xen-ia64-unstable.hg.060313/
linux-2.6.16-rc5-xen0'
make[3]: *** [build] Error 2
make[3]: Leaving directory `/home/takebe/xen-ia64-unstable.hg.060313'
make[2]: *** [linux-2.6-xen0-install] Error 2
make[2]: Leaving directory `/home/takebe/xen-ia64-unstable.hg.060313'
make[1]: *** [install-kernels] Error 1
make[1]: Leaving directory `/home/takebe/xen-ia64-unstable.hg.060313'
make: *** [world] Error 2


The bellow is my patch.
=================================
Signed-off-by: Akio Takebe <takebe_akio@xxxxxxxxxxxxxx>

diff -r 551f7935f79a linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h        Fri Mar 
10 08:25:54 2006 -0700
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h        Mon Mar 
13 18:10:16 2006 +0900
@@ -62,7 +62,7 @@ void force_evtchn_callback(void);
 #define INVALID_P2M_ENTRY      (~0UL)
 #define __pte_ma(_x)   ((pte_t) {(_x)})
 #define phys_to_machine_mapping_valid(_x)      (1)
-#define        kmap_flush_unused()     do {} while (0)
+//#define      kmap_flush_unused()     do {} while (0)
 #define set_phys_to_machine(_x,_y)     do {} while (0)
 #define xen_machphys_update(_x,_y)     do {} while (0)
 #define pfn_pte_ma(_x,_y)      __pte_ma(0)

Best Regards,

Akio Takebe


_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel