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-devel

Re: [Xen-devel] Inconsistent patches in xen/stable-2.6.32.x

To: M A Young <m.a.young@xxxxxxxxxxxx>
Subject: Re: [Xen-devel] Inconsistent patches in xen/stable-2.6.32.x
From: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
Date: Wed, 4 May 2011 09:17:16 +0100
Cc: Fitzhardinge <jeremy@xxxxxxxx>, "xen-devel@xxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxx>, Jeremy
Delivery-date: Wed, 04 May 2011 01:18:03 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <alpine.LFD.2.02.1105032259010.10070@xxxxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Organization: Citrix Systems, Inc.
References: <alpine.LFD.2.02.1105032259010.10070@xxxxxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
On Wed, 2011-05-04 at 00:40 +0100, M A Young wrote:
> I am trying to compile a kernel based on xen/stable-2.6.32.x and am 
> running into a compile problem, which I think is due to the combination of 
> the following two patches
> http://git.kernel.org/?p=linux/kernel/git/jeremy/xen.git;a=commit;h=5473680bdedb7a62e641970119e6e9381a8d80f4
> which adds
> .suspend = netfront_suspend,
> to a xenbus_driver structure calling the routine
> static int netfront_suspend(struct xenbus_device *dev, pm_message_t state)
> and
> http://git.kernel.org/?p=linux/kernel/git/jeremy/xen.git;a=commit;h=cfb2480c92131e66d1fda9d928303ce4d41e6b7c
> which alters the definition of suspend by replacing
> int (*suspend)(struct xenbus_device *dev, pm_message_t state);
> with
> int (*suspend)(struct xenbus_device *dev);
> and the compiler I am using is sufficiently fussy to report this as an 
> error.
> 
> I think we need the attached patch to make things consistent again.

Agreed. This is because upstream netfront doesn't have the suspend
callback because smartpoll was never upstreamed and this wasn't noticed
when the upstream patch was backported..

> Signed-off-by: Michael Young <m.a.young@xxxxxxxxxxxx>

Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

On the other hand maybe we should just tear smartpoll mode out of the
2.6.32.x tree? It's broken, disabled for ages and noone appears to be
interested in fixing it.

Ian.


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

<Prev in Thread] Current Thread [Next in Thread>