---
 xen-unstable.hg/Config.mk                  |    8 --------
 xen-unstable.hg/xen/Makefile               |   16 ----------------
 xen-unstable.hg/xen/include/acm/acm_core.h |    4 +++-
 3 files changed, 3 insertions(+), 25 deletions(-)

Index: root/xen-unstable.hg/Config.mk
===================================================================
--- root.orig/xen-unstable.hg/Config.mk
+++ root/xen-unstable.hg/Config.mk
@@ -81,14 +81,6 @@ CFLAGS += $(foreach i, $(EXTRA_INCLUDES)
 #        n - Do not build the Xen ACM framework
 ACM_SECURITY ?= y
 
-# If ACM_SECURITY = y and no boot policy file is installed,
-# then the ACM defaults to the security policy set by
-# ACM_DEFAULT_SECURITY_POLICY
-# Supported models are:
-#	ACM_NULL_POLICY
-#	ACM_CHINESE_WALL_AND_SIMPLE_TYPE_ENFORCEMENT_POLICY
-ACM_DEFAULT_SECURITY_POLICY ?= ACM_CHINESE_WALL_AND_SIMPLE_TYPE_ENFORCEMENT_POLICY
-
 # Optional components
 XENSTAT_XENTOP     ?= y
 VTPM_TOOLS         ?= n
Index: root/xen-unstable.hg/xen/Makefile
===================================================================
--- root.orig/xen-unstable.hg/xen/Makefile
+++ root/xen-unstable.hg/xen/Makefile
@@ -59,7 +59,6 @@ _clean: delete-unfresh-files
 	$(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) clean
 	rm -f include/asm *.o $(TARGET)* *~ core
 	rm -f include/asm-*/asm-offsets.h
-	rm -f include/xen/acm_policy.h
 
 .PHONY: _distclean
 _distclean: clean
@@ -72,7 +71,6 @@ $(TARGET).gz: $(TARGET)
 $(TARGET): delete-unfresh-files build-headers
 	$(MAKE) -C tools
 	$(MAKE) -f $(BASEDIR)/Rules.mk include/xen/compile.h
-	$(MAKE) -f $(BASEDIR)/Rules.mk include/xen/acm_policy.h
 	[ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm
 	$(MAKE) -f $(BASEDIR)/Rules.mk -C include
 	$(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) asm-offsets.s
@@ -87,20 +85,6 @@ delete-unfresh-files:
 		rm -f include/xen/compile.h; \
 	fi
 
-# acm_policy.h contains security policy for Xen
-include/xen/acm_policy.h:
-	@(set -e; \
-	  echo "/*"; \
-	  echo " * DO NOT MODIFY."; \
-	  echo " *"; \
-	  echo " * This file was auto-generated by xen/Makefile $<"; \
-	  echo " *"; \
-	  echo " */"; \
-	  echo ""; \
-	  echo "#ifndef ACM_DEFAULT_SECURITY_POLICY"; \
-	  echo "#define ACM_DEFAULT_SECURITY_POLICY $(ACM_DEFAULT_SECURITY_POLICY)"; \
-	  echo "#endif") >$@
-
 # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
 include/xen/compile.h: include/xen/compile.h.in
 	@sed -e 's/@@date@@/$(shell LC_ALL=C date)/g' \
Index: root/xen-unstable.hg/xen/include/acm/acm_core.h
===================================================================
--- root.orig/xen-unstable.hg/xen/include/acm/acm_core.h
+++ root/xen-unstable.hg/xen/include/acm/acm_core.h
@@ -22,10 +22,12 @@
 #include <xen/spinlock.h>
 #include <xen/list.h>
 #include <public/acm.h>
-#include <xen/acm_policy.h>
 #include <public/acm_ops.h>
 #include <acm/acm_endian.h>
 
+#define ACM_DEFAULT_SECURITY_POLICY \
+        ACM_CHINESE_WALL_AND_SIMPLE_TYPE_ENFORCEMENT_POLICY
+
 /* Xen-internal representation of the binary policy */
 struct acm_binary_policy {
     char *policy_reference_name;