[Xen-changelog] [linux-2.6.18-xen] Linux blkback: Resolve symbol collision with blktap.

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1181211073 -3600
# Node ID 85b046c1da186089a6069b4d0f879ea7c32c4c42
# Parent  0301c1fd8c0d7cf581a8a155745731c19b6fe0b1
Linux blkback: Resolve symbol collision with blktap.
Signed-off-by: Satoshi UCHIDA <s-uchida@xxxxxxxxxxxxx>
---
 drivers/xen/blkback/xenbus.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 0301c1fd8c0d -r 85b046c1da18 drivers/xen/blkback/xenbus.c
--- a/drivers/xen/blkback/xenbus.c      Thu Jun 07 11:10:12 2007 +0100
+++ b/drivers/xen/blkback/xenbus.c      Thu Jun 07 11:11:13 2007 +0100
@@ -109,7 +109,7 @@ static void update_blkif_status(blkif_t 
                                                                        \
                return sprintf(buf, format, ##args);                    \
        }                                                               \
-       DEVICE_ATTR(name, S_IRUGO, show_##name, NULL)
+       static DEVICE_ATTR(name, S_IRUGO, show_##name, NULL)
 
 VBD_SHOW(oo_req,  "%d\n", be->blkif->st_oo_req);
 VBD_SHOW(rd_req,  "%d\n", be->blkif->st_rd_req);

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