From: Keir Fraser Date: Wed, 7 Oct 2009 06:33:40 +0000 (+0100) Subject: xen: re-synchronize ring.h public header X-Git-Tag: xen-3.4.2~6 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=16b165532214dd150f0dc0b106b78f7ce06bfac3;p=legacy%2Flinux-2.6.18-xen.git xen: re-synchronize ring.h public header Patch 20267:e9366bed077e modified the definition of sring in the xen repo's version of ring.h, but not the version in the linux kernel repo. That change broke pause/resume/shutdown messages from the blktap2 kernel module, which (for the time being) relies on pad[0] being at consistent location in the sring struct. This patch fixes this regression by resyncronizing the two the files. Signed off by: Jake Wires --- diff --git a/include/xen/interface/io/ring.h b/include/xen/interface/io/ring.h index 6ce1d0d4..3c56bc2d 100644 --- a/include/xen/interface/io/ring.h +++ b/include/xen/interface/io/ring.h @@ -97,7 +97,8 @@ union __name##_sring_entry { \ struct __name##_sring { \ RING_IDX req_prod, req_event; \ RING_IDX rsp_prod, rsp_event; \ - uint8_t pad[48]; \ + uint8_t netfront_smartpoll_active; \ + uint8_t pad[47]; \ union __name##_sring_entry ring[1]; /* variable-length */ \ }; \ \