[Xen-devel] Patch for 2.6.31-rc9

[Andy Georges <andy.georges@xxxxxxxxxxxxx>]

Hi,


When building the 2.6.31-rc9 kernel with xen patches, obtained as per  
the instructions on http://wiki.xensource.com/xenwiki/XenParavirtOps,  
i.e.,
$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/ 
xen.git linux-2.6-xen
$ cd linux-2.6-xen
$ git checkout origin/xen/master -b xen/master
$ git pull
$ make menuconfig

I ran into the following error:

root@assail:/usr/src/linux-2.6-xen# make -j 12 modules
  CHK     include/linux/version.h
  CHK     include/linux/utsrelease.h
  SYMLINK include/asm -> include/asm-x86
  CALL    scripts/checksyscalls.sh
  CC [M]  drivers/gpu/drm/ttm/ttm_agp_backend.o
  CC [M]  drivers/gpu/drm/via/via_irq.o
  CC [M]  drivers/gpu/drm/ttm/ttm_memory.o
  CC [M]  drivers/gpu/drm/via/via_drv.o
In file included from /usr/src/linux-2.6-xen/arch/x86/include/asm/ 
agp.h:4,
                 from drivers/gpu/drm/ttm/ttm_agp_backend.c:39:
include/linux/swiotlb.h:48: warning: ‘enum dma_data_direction’  
declared inside parameter list
include/linux/swiotlb.h:48: warning: its scope is only this definition  
or declaration, which is probably not what you want
include/linux/swiotlb.h:51: warning: ‘enum dma_data_direction’  
declared inside parameter list
include/linux/swiotlb.h:63: warning: ‘enum dma_data_direction’  
declared inside parameter list
include/linux/swiotlb.h:68: warning: ‘enum dma_data_direction’  
declared inside parameter list
include/linux/swiotlb.h:72: warning: ‘enum dma_data_direction’  
declared inside parameter list
include/linux/swiotlb.h:76: warning: ‘enum dma_data_direction’  
declared inside parameter list
include/linux/swiotlb.h:80: warning: ‘enum dma_data_direction’  
declared inside parameter list
include/linux/swiotlb.h:84: warning: ‘enum dma_data_direction’  
declared inside parameter list
include/linux/swiotlb.h:89: warning: ‘enum dma_data_direction’  
declared inside parameter list
include/linux/swiotlb.h:94: warning: ‘enum dma_data_direction’  
declared inside parameter list
In file included from /usr/src/linux-2.6-xen/arch/x86/include/asm/ 
agp.h:8,
                 from drivers/gpu/drm/ttm/ttm_agp_backend.c:39:
/usr/src/linux-2.6-xen/arch/x86/include/asm/dma-mapping.h: In function  
‘get_dma_ops’:
/usr/src/linux-2.6-xen/arch/x86/include/asm/dma-mapping.h:29: error:  
dereferencing pointer to incomplete type
/usr/src/linux-2.6-xen/arch/x86/include/asm/dma-mapping.h:32: error:  
dereferencing pointer to incomplete type
In file included from /usr/src/linux-2.6-xen/arch/x86/include/asm/dma- 
mapping.h:36,
                 from /usr/src/linux-2.6-xen/arch/x86/include/asm/ 
agp.h:8,
                 from drivers/gpu/drm/ttm/ttm_agp_backend.c:39:
<snip>

The last change to the kernel was:

commit 3973dcf8835207714f10ce4847fa57e9f35b8197
Merge: ebf47a1 7676973
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Date:   Thu Sep 17 12:47:49 2009 -0700

    Merge commit 'xen/xen/xenfb' into xen/master

    * commit 'xen/xen/xenfb':
      xenfb: connect to backend before registering fb


The above issue can be resolved by the following patch:

diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index cb1a663..f4ebffb 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -2,6 +2,7 @@
 #define __LINUX_SWIOTLB_H

 #include <linux/types.h>
+#include <linux/dma-mapping.h>

 struct device;
 struct dma_attrs;

I did get the patch from the Fedora list, after googling, so maybe  
somebody already has it lined up for inclusion (http://www.mail-archive.com/fedora-xen@xxxxxxxxxx/msg02913.html 
)?
Hope this helps,
-- Andy



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