Index: sys/xen/gnttab.h
===================================================================
--- sys/xen/gnttab.h
+++ sys/xen/gnttab.h
@@ -117,46 +117,4 @@
 int gnttab_suspend(void);
 int gnttab_resume(device_t);
 
-#if 0
-
-#include <xen/features.h>
-
-static inline void
-gnttab_set_map_op(struct gnttab_map_grant_ref *map, vm_paddr_t addr,
-		  uint32_t flags, grant_ref_t ref, domid_t domid)
-{
-	if (flags & GNTMAP_contains_pte)
-		map->host_addr = addr;
-	else
-		map->host_addr = vtophys(addr);
-
-	map->flags = flags;
-	map->ref = ref;
-	map->dom = domid;
-}
-
-static inline void
-gnttab_set_unmap_op(struct gnttab_unmap_grant_ref *unmap, vm_paddr_t addr,
-		    uint32_t flags, grant_handle_t handle)
-{
-	if (flags & GNTMAP_contains_pte)
-		unmap->host_addr = addr;
-	else
-		unmap->host_addr = vtophys(addr);
-
-	unmap->handle = handle;
-	unmap->dev_bus_addr = 0;
-}
-
-static inline void
-gnttab_set_replace_op(struct gnttab_unmap_and_replace *unmap, vm_paddr_t addr,
-		      vm_paddr_t new_addr, grant_handle_t handle)
-{
-	unmap->host_addr = vtophys(addr);
-	unmap->new_addr = vtophys(new_addr);
-
-	unmap->handle = handle;
-}
-#endif
-
 #endif /* __ASM_GNTTAB_H__ */