diff options
| author | James Carter <jwcart2@tycho.nsa.gov> | 2011-09-17 16:20:58 +0100 |
|---|---|---|
| committer | James Carter <jwcart2@tycho.nsa.gov> | 2011-09-17 16:20:58 +0100 |
| commit | d285a773d6f5d7fb4e654291b5fce90bb8ec8852 (patch) | |
| tree | 47d6bf92617042a7788af7af610fa020c364a9e2 /xen/arch/x86/platform_hypercall.c | |
| parent | 4dd27c01c31c55319758b47dccdba46ddd5f499e (diff) | |
| download | xen-d285a773d6f5d7fb4e654291b5fce90bb8ec8852.tar.gz xen-d285a773d6f5d7fb4e654291b5fce90bb8ec8852.tar.bz2 xen-d285a773d6f5d7fb4e654291b5fce90bb8ec8852.zip | |
xen/xsm: Compile error due to naming clash between XSM and EFI runtime
The problem is that efi_runtime_call is the name of both a function in
xen/arch/x86/efi/runtime.c and a member of the xsm_operations struct
in xen/include/xsm/xsm.h. This causes the macro "#define
efi_runtime_call(x) efi_compat_runtime_call(x)" on line 15 of
xen/arch/x86/x86_64/platform_hypercall.c to cause the above compile
error.
Renaming the XSM struct member fixes the problem.
Signed-off-by: James Carter <jwcart2@tycho.nsa.gov>
Acked-by: Jan Beulich <jbeulich@suse.com>
Diffstat (limited to 'xen/arch/x86/platform_hypercall.c')
| -rw-r--r-- | xen/arch/x86/platform_hypercall.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index db5554c47f..d10024ae94 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -306,7 +306,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op) break; case XENPF_efi_runtime_call: - ret = xsm_efi_runtime_call(); + ret = xsm_efi_call(); if ( ret ) break; |