[Xen-changelog] [xen master] xen/xsm: flask: Fix compilation when CONFIG_COMPAT=n

[patchbot@xxxxxxx]

commit 8e80eb95ec4e20e62f2ad7ab645b7c71191afd64
Author:     Julien Grall <julien.grall@xxxxxxxxxx>
AuthorDate: Mon Mar 17 14:05:57 2014 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Fri Mar 21 11:10:13 2014 +0000

    xen/xsm: flask: Fix compilation when CONFIG_COMPAT=n
    
    The commit f7d29f7b "flask: add compat mode guest support" introduces
    build breakage on ARM when XSM is enabled. It's because ARM doesn't use
    compat mode.
    
    flask_op.c:794:34: fatal error: compat/event_channel.h: No such file or 
directory
     #include <compat/event_channel.h>
    
    Signed-off-by: Julien Grall <julien.grall@xxxxxxxxxx>
    Acked-by: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 xen/xsm/flask/flask_op.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c
index 3b84679..9dd9081 100644
--- a/xen/xsm/flask/flask_op.c
+++ b/xen/xsm/flask/flask_op.c
@@ -785,7 +785,7 @@ ret_t do_flask_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) 
u_flask_op)
     return rv;
 }
 
-#ifndef COMPAT
+#if defined(CONFIG_COMPAT) && !defined(COMPAT)
 #undef _copy_to_guest
 #define _copy_to_guest copy_to_compat
 #undef _copy_from_guest
--
generated by git-patchbot for /home/xen/git/xen.git#master

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