[Xen-changelog] [xen-unstable] merge

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Stefano Stabellini <sstabellini@xxxxxxxxxxxxx>
# Date 1280933890 -3600
# Node ID eea7a2d7efab386ef6ccd0186e58a88d24587b8d
# Parent  20540b8fe4b6d32daa87cf9becb425da548c1f02
# Parent  624c5fdf02846eb2038490eb9f2af7c48f4ef032
merge
---
 tools/libxc/xc_private.c |   15 ---------------
 1 files changed, 15 deletions(-)

diff -r 20540b8fe4b6 -r eea7a2d7efab tools/libxc/xc_private.c
--- a/tools/libxc/xc_private.c  Wed Aug 04 14:43:46 2010 +0100
+++ b/tools/libxc/xc_private.c  Wed Aug 04 15:58:10 2010 +0100
@@ -57,8 +57,6 @@ xc_interface *xc_interface_open(xentooll
     return 0;
 }
 
-static void xc_clean_hcall_buf(void);
-
 int xc_interface_close(xc_interface *xch)
 {
     int rc = 0;
@@ -70,9 +68,6 @@ int xc_interface_close(xc_interface *xch
         rc = xc_interface_close_core(xch, xch->fd);
         if (rc) PERROR("Could not close hypervisor interface");
     }
-
-    xc_clean_hcall_buf();
-
     free(xch);
     return rc;
 }
@@ -185,8 +180,6 @@ int hcall_buf_prep(void **addr, size_t l
 int hcall_buf_prep(void **addr, size_t len) { return 0; }
 void hcall_buf_release(void **addr, size_t len) { }
 
-static void xc_clean_hcall_buf(void) { }
-
 #else /* !__sun__ */
 
 int lock_pages(void *addr, size_t len)
@@ -230,14 +223,6 @@ static void _xc_clean_hcall_buf(void *m)
     }
 
     pthread_setspecific(hcall_buf_pkey, NULL);
-}
-
-static void xc_clean_hcall_buf(void)
-{
-    void *hcall_buf = pthread_getspecific(hcall_buf_pkey);
-
-    if (hcall_buf)
-        _xc_clean_hcall_buf(hcall_buf);
 }
 
 static void _xc_init_hcall_buf(void)

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