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/include/xsm | |
| 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/include/xsm')
| -rw-r--r-- | xen/include/xsm/xsm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index ffc84a53a8..8d67bbd114 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -132,7 +132,7 @@ struct xsm_operations { int (*physinfo) (void); int (*platform_quirk) (uint32_t); int (*firmware_info) (void); - int (*efi_runtime_call) (void); + int (*efi_call) (void); int (*acpi_sleep) (void); int (*change_freq) (void); int (*getidletime) (void); @@ -554,9 +554,9 @@ static inline int xsm_firmware_info (void) return xsm_call(firmware_info()); } -static inline int xsm_efi_runtime_call (void) +static inline int xsm_efi_call (void) { - return xsm_call(efi_runtime_call()); + return xsm_call(efi_call()); } static inline int xsm_acpi_sleep (void) |