WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [linux-2.6.18-xen] Fix PV-on-HVM driver build.

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [linux-2.6.18-xen] Fix PV-on-HVM driver build.
From: "Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>
Date: Fri, 27 Jul 2007 02:29:31 -0700
Delivery-date: Fri, 27 Jul 2007 02:27:33 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1184252709 -3600
# Node ID 670f8d5305d25cfd79da42eb89d6f50ac745281c
# Parent  c9cbeaa471402fc2ba786b83cda9184975cb69b8
Fix PV-on-HVM driver build.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 drivers/xen/core/gnttab.c                  |    4 ++--
 drivers/xen/netfront/netfront.c            |    4 ----
 drivers/xen/netfront/netfront.h            |    4 ++++
 include/asm-i386/mach-xen/asm/gnttab_dma.h |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff -r c9cbeaa47140 -r 670f8d5305d2 drivers/xen/core/gnttab.c
--- a/drivers/xen/core/gnttab.c Thu Jul 12 16:04:55 2007 +0100
+++ b/drivers/xen/core/gnttab.c Thu Jul 12 16:05:09 2007 +0100
@@ -65,8 +65,6 @@ static struct grant_entry *shared;
 
 static struct gnttab_free_callback *gnttab_free_callback_list;
 
-static DEFINE_SEQLOCK(gnttab_dma_lock);
-
 static int gnttab_expand(unsigned int req_entries);
 
 #define RPP (PAGE_SIZE / sizeof(grant_ref_t))
@@ -430,6 +428,8 @@ static inline unsigned int max_nr_grant_
 
 #ifdef CONFIG_XEN
 
+static DEFINE_SEQLOCK(gnttab_dma_lock);
+
 #ifdef CONFIG_X86
 static int map_pte_fn(pte_t *pte, struct page *pmd_page,
                      unsigned long addr, void *data)
diff -r c9cbeaa47140 -r 670f8d5305d2 drivers/xen/netfront/netfront.c
--- a/drivers/xen/netfront/netfront.c   Thu Jul 12 16:04:55 2007 +0100
+++ b/drivers/xen/netfront/netfront.c   Thu Jul 12 16:05:09 2007 +0100
@@ -65,10 +65,6 @@
 #include <xen/gnttab.h>
 #include <xen/hypercall.h>
 
-#ifdef HAVE_XEN_PLATFORM_COMPAT_H
-#include <xen/platform-compat.h>
-#endif
-
 struct netfront_cb {
        struct page *page;
        unsigned offset;
diff -r c9cbeaa47140 -r 670f8d5305d2 drivers/xen/netfront/netfront.h
--- a/drivers/xen/netfront/netfront.h   Thu Jul 12 16:04:55 2007 +0100
+++ b/drivers/xen/netfront/netfront.h   Thu Jul 12 16:05:09 2007 +0100
@@ -44,6 +44,10 @@
 
 #include <xen/xenbus.h>
 
+#ifdef HAVE_XEN_PLATFORM_COMPAT_H
+#include <xen/platform-compat.h>
+#endif
+
 /* 
  * Function pointer table for hooks into a network acceleration
  * plugin.  These are called at appropriate points from the netfront
diff -r c9cbeaa47140 -r 670f8d5305d2 include/asm-i386/mach-xen/asm/gnttab_dma.h
--- a/include/asm-i386/mach-xen/asm/gnttab_dma.h        Thu Jul 12 16:04:55 
2007 +0100
+++ b/include/asm-i386/mach-xen/asm/gnttab_dma.h        Thu Jul 12 16:05:09 
2007 +0100
@@ -30,7 +30,7 @@ static inline maddr_t gnttab_dma_map_pag
 static inline maddr_t gnttab_dma_map_page(struct page *page)
 {
        __gnttab_dma_map_page(page);
-       return page_to_bus(page);
+       return ((maddr_t)pfn_to_mfn(page_to_pfn(page)) << PAGE_SHIFT);
 }
 
 static inline void gnttab_dma_unmap_page(maddr_t maddr)

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [linux-2.6.18-xen] Fix PV-on-HVM driver build., Xen patchbot-linux-2.6.18-xen <=