Failed in applying to current master (
apply log)
xen/include/Makefile | 2 +-
xen/include/asm-x86/alternative.h | 4 +-
xen/include/xsm/dummy.h | 19 ---
xen/include/xsm/xsm.h | 39 ++----
xen/xsm/Makefile | 1 +
xen/xsm/dummy.c | 254 ++++++++++++++++++++------------------
xen/xsm/flask/flask_op.c | 60 ++++-----
xen/xsm/flask/hooks.c | 9 --
xen/xsm/private.h | 16 +++
xen/xsm/xsm_core.c | 12 --
xen/xsm/xsm_op.c | 51 ++++++++
11 files changed, 245 insertions(+), 222 deletions(-)
create mode 100644 xen/xsm/private.h
create mode 100644 xen/xsm/xsm_op.c