From: "Jan Beulich" <jbeulich@novell.com>
Subject: [PATCH] linux: fix pv driver build
Date: Wed, 05 Mar 2008 16:08:45 +0000
Message-ID: <47CED39D.76E4.0078.0@novell.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

When building with -Werror-implicit-function-declaration, the addition
of is_initial_xen_domain() checks in drivers/xen/netfront/accel.c
causes the build to fail.

Additionally, drivers/xen/netfront/netfront.c illegally (and
needlessly) includes xen/hypercall.h directly.

As usual, written and tested on 2.6.25-rc3 and made apply to the 2.6.18
tree without further testing.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

Index: head-2008-02-26/drivers/xen/netfront/accel.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- head-2008-02-26.orig/drivers/xen/netfront/accel.c	2008-02-26 =
18:00:45.000000000 +0100
+++ head-2008-02-26/drivers/xen/netfront/accel.c	2008-03-05 =
16:29:35.000000000 +0100
@@ -32,7 +32,7 @@
 #include <linux/skbuff.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
-
+#include <asm/hypervisor.h>
 #include <xen/xenbus.h>
=20
 #include "netfront.h"
Index: head-2008-02-26/drivers/xen/netfront/netfront.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- head-2008-02-26.orig/drivers/xen/netfront/netfront.c	2008-03-05 =
16:27:37.000000000 +0100
+++ head-2008-02-26/drivers/xen/netfront/netfront.c	2008-03-05 =
16:29:27.000000000 +0100
@@ -63,7 +63,6 @@
 #include <asm/uaccess.h>
 #include <xen/interface/grant_table.h>
 #include <xen/gnttab.h>
-#include <xen/hypercall.h>
=20
 struct netfront_cb {
 	struct page *page;