[Xen-devel] Re: [Xen-changelog] Fix the implicit declaration of function `swiotlb_init' warning, by including

[Muli Ben-Yehuda <mulix@xxxxxxxxx>]

On Tue, Mar 21, 2006 at 01:14:15PM +0000, Xen patchbot -unstable wrote:

> diff -r a013fa6ee37c -r 14c26df4f33c 
> linux-2.6-xen-sparse/arch/i386/mm/init-xen.c
> --- a/linux-2.6-xen-sparse/arch/i386/mm/init-xen.c    Tue Mar 21 10:56:11 2006
> +++ b/linux-2.6-xen-sparse/arch/i386/mm/init-xen.c    Tue Mar 21 11:21:08 2006
> @@ -42,6 +42,11 @@
>  #include <asm/tlbflush.h>
>  #include <asm/sections.h>
>  #include <asm/hypervisor.h>
> +#if defined(CONFIG_SWIOTLB)
> +#include <linux/dma-mapping.h>
> +#include <asm/scatterlist.h>
> +#include <asm/swiotlb.h>
> +#endif

Hmm, the right way(TM) to do it is as follows (compile tested
only). We're firmly in nit-picking territory, but it's one less thing
that will be pointed out when we finally submit it for upstream
inclusion.

Signed-off-by: Muli Ben-Yehuda <mulix@xxxxxxxxx>

diff -r 045bee6e1ebd linux-2.6-xen-sparse/arch/i386/mm/init-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/mm/init-xen.c      Tue Mar 21 12:26:38 
2006 +0100
+++ b/linux-2.6-xen-sparse/arch/i386/mm/init-xen.c      Tue Mar 21 20:43:54 
2006 +0200
@@ -29,6 +29,8 @@
 #include <linux/efi.h>
 #include <linux/memory_hotplug.h>
 #include <linux/initrd.h>
+#include <linux/dma-mapping.h>
+#include <linux/scatterlist.h>
 
 #include <asm/processor.h>
 #include <asm/system.h>
@@ -42,11 +44,7 @@
 #include <asm/tlbflush.h>
 #include <asm/sections.h>
 #include <asm/hypervisor.h>
-#if defined(CONFIG_SWIOTLB)
-#include <linux/dma-mapping.h>
-#include <asm/scatterlist.h>
 #include <asm/swiotlb.h>
-#endif
 
 extern unsigned long *contiguous_bitmap;
 

-- 
Muli Ben-Yehuda
http://www.mulix.org | http://mulix.livejournal.com/


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