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

[M A Young <m.a.young@xxxxxxxxxxxx>]

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@xxxxxxxxxxxx>

Attachment: netfront_suspend.patch
Description: Text document

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