Mailing List Archive: Inconsistent patches in xen/stable-2.6.32.x

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.

Signed-off-by: Michael Young <m.a.young@durham.ac.uk>

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@durham.ac.uk>

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

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@lists.xensource.com
http://lists.xensource.com/xen-devel

Mailing List Archive

Mailing List Archive

Attached Files: