diff -r 39c2cab9e765 xen/include/xsm/xsm.h
--- a/xen/include/xsm/xsm.h	Mon Jul 14 10:12:07 2008 +0100
+++ b/xen/include/xsm/xsm.h	Tue Jul 15 14:01:42 2008 -0400
@@ -108,7 +108,6 @@ struct xsm_operations {
     int (*schedop_shutdown) (struct domain *d1, struct domain *d2);
 
     long (*__do_xsm_op) (XEN_GUEST_HANDLE(xsm_op_t) op);
-    void (*complete_init) (struct domain *d);
 
 #ifdef CONFIG_X86
     int (*shadow_control) (struct domain *d, uint32_t op);
@@ -392,11 +391,6 @@ static inline long __do_xsm_op (XEN_GUES
     return xsm_call(__do_xsm_op(op));
 }
 
-static inline void xsm_complete_init (struct domain *d)
-{
-    xsm_call(complete_init(d));
-}
-
 #ifdef XSM_ENABLE
 extern int xsm_init(unsigned int *initrdidx, const multiboot_info_t *mbi,
                                           unsigned long initial_images_start);
diff -r 39c2cab9e765 xen/xsm/dummy.c
--- a/xen/xsm/dummy.c	Mon Jul 14 10:12:07 2008 +0100
+++ b/xen/xsm/dummy.c	Tue Jul 15 14:01:42 2008 -0400
@@ -250,11 +250,6 @@ static int dummy_alloc_security_evtchn (
 }
 
 static void dummy_free_security_evtchn (struct evtchn *chn)
-{
-    return;
-}
-
-static void dummy_complete_init (struct domain *d)
 {
     return;
 }
@@ -457,7 +452,6 @@ void xsm_fixup_ops (struct xsm_operation
     set_to_dummy_if_null(ops, schedop_shutdown);
 
     set_to_dummy_if_null(ops, __do_xsm_op);
-    set_to_dummy_if_null(ops, complete_init);
 
 #ifdef CONFIG_X86
     set_to_dummy_if_null(ops, shadow_control);
diff -r 39c2cab9e765 xen/xsm/flask/hooks.c
--- a/xen/xsm/flask/hooks.c	Mon Jul 14 10:12:07 2008 +0100
+++ b/xen/xsm/flask/hooks.c	Tue Jul 15 14:01:42 2008 -0400
@@ -712,18 +712,6 @@ static int flask_perfcontrol(void)
 static int flask_perfcontrol(void)
 {
     return domain_has_xen(current->domain, XEN__PERFCONTROL);
-}
-
-void flask_complete_init(struct domain *d)
-{
-    struct domain_security_struct *dsec;
-
-    /* Set the security state for the Dom0 domain. */
-    dsec = d->ssid;
-    dsec->sid = SECINITSID_DOM0;
-    dsec->create_sid = SECINITSID_UNLABELED;
-
-    printk("Flask:  Completed initialization.\n");
 }
 
 #ifdef CONFIG_X86
@@ -1101,7 +1089,6 @@ static struct xsm_operations flask_ops =
     .schedop_shutdown = flask_schedop_shutdown,
 
     .__do_xsm_op = do_flask_op,
-    .complete_init = flask_complete_init,    
 
 #ifdef CONFIG_X86
     .shadow_control = flask_shadow_control,