bitkeeper revision 1.1236.21.1 (422f6572a9UTrKNu9Wm3aHvy00ZEwA)

fix gcc 3.4 compile probs on blktap.

Signed-off-by: andrew.warfield@cl.cam.ac.uk

diff --git a/linux-2.6.10-xen-sparse/drivers/xen/blktap/blktap.h b/linux-2.6.10-xen-sparse/drivers/xen/blktap/blktap.h
index e851cc72af683ca5b0b134f16698fe9a91c46a9e..eb084e8f063a57a3ce144fa8ba7cdb5e1ed77377 100644 (file)
--- a/linux-2.6.10-xen-sparse/drivers/xen/blktap/blktap.h
+++ b/linux-2.6.10-xen-sparse/drivers/xen/blktap/blktap.h
@@ -110,10 +110,18 @@ typedef struct {
 typedef unsigned int ACTIVE_RING_IDX;
 
 active_req_t *lookup_active_req(ACTIVE_RING_IDX idx);
-inline unsigned int ID_TO_IDX(unsigned long id);
-inline domid_t ID_TO_DOM(unsigned long id);
 
-inline void active_reqs_init(void);
+extern inline unsigned int ID_TO_IDX(unsigned long id) 
+{ 
+    return ( id & 0x0000ffff );
+}
+
+extern inline domid_t ID_TO_DOM(unsigned long id) 
+{ 
+    return (id >> 16); 
+}
+
+void active_reqs_init(void);
 
 /* -------[ interposition -> character device interface ]------------- */
 
@@ -224,8 +232,8 @@ int write_resp_to_fe_ring(blkif_t *blkif, blkif_response_t *rsp);
 int write_req_to_be_ring(blkif_request_t *req);
 
 /* event notification functions */
-inline void kick_fe_domain(blkif_t *blkif);
-inline void kick_be_domain(void);
+void kick_fe_domain(blkif_t *blkif);
+void kick_be_domain(void);
 
 /* Interrupt handlers. */
 irqreturn_t blkif_ptbe_int(int irq, void *dev_id, 

diff --git a/linux-2.6.10-xen-sparse/drivers/xen/blktap/blktap_datapath.c b/linux-2.6.10-xen-sparse/drivers/xen/blktap/blktap_datapath.c
index 88360e5ab43c2fd386866ec8211c2f39496a4a8c..e88c5629a6980196ee7faebe5172f6cdcf6cc090 100644 (file)
--- a/linux-2.6.10-xen-sparse/drivers/xen/blktap/blktap_datapath.c
+++ b/linux-2.6.10-xen-sparse/drivers/xen/blktap/blktap_datapath.c
@@ -59,7 +59,7 @@ active_req_t *lookup_active_req(ACTIVE_RING_IDX idx)
     return &active_reqs[idx];   
 }
 
-inline void active_reqs_init(void)
+void active_reqs_init(void)
 {
     ACTIVE_RING_IDX i;
     
@@ -80,13 +80,6 @@ static inline unsigned long MAKE_ID(domid_t fe_dom, ACTIVE_RING_IDX idx)
     return ( (fe_dom << 16) | idx );
 }
 
-inline unsigned int ID_TO_IDX(unsigned long id) 
-{ 
-        return ( id & 0x0000ffff );
-}
-
-inline domid_t ID_TO_DOM(unsigned long id) { return (id >> 16); }
-
 /*-----[ Ring helpers ]---------------------------------------------------*/
 
 inline int write_resp_to_fe_ring(blkif_t *blkif, blkif_response_t *rsp)
@@ -127,7 +120,7 @@ inline int write_req_to_be_ring(blkif_request_t *req)
     return 0;
 }
 
-inline void kick_fe_domain(blkif_t *blkif) 
+void kick_fe_domain(blkif_t *blkif) 
 {
     RING_PUSH_RESPONSES(&blkif->blk_ring);
     notify_via_evtchn(blkif->evtchn);
@@ -135,7 +128,7 @@ inline void kick_fe_domain(blkif_t *blkif)
     
 }
 
-inline void kick_be_domain(void)
+void kick_be_domain(void)
 {
     if ( blktap_be_state != BLKIF_STATE_CONNECTED ) 
         return;