diff options
| author |   Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2017-05-02 13:23:06 -0400 |
|---|---|---|
| committer |   Juergen Gross <jgross@suse.com> | 2017-05-03 06:46:11 +0200 |
| commit | 3dbd8204af48d0da442f11ad39aa778a5fd462bf (patch) | |
| tree | c54763ac63471a230f293290412531e42de4c931 /arch | |
| parent | xen: Implement EFI reset_system callback (diff) | |
| download | linux-dev-3dbd8204af48d0da442f11ad39aa778a5fd462bf.tar.xz linux-dev-3dbd8204af48d0da442f11ad39aa778a5fd462bf.zip | |
xen: Move xen_have_vector_callback definition to enlighten.c
Commit 84d582d236dc ("xen: Revert commits da72ff5bfcb0 and
72a9b186292d") defined xen_have_vector_callback in enlighten_hvm.c.
Since guest-type-neutral code refers to this variable this causes
build failures when CONFIG_XEN_PVHVM is not defined.
Moving xen_have_vector_callback definition to enlighten.c resolves
this issue.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/xen/enlighten.c | 3 | ||||
| -rw-r--r-- | arch/x86/xen/enlighten_hvm.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 41d324c7261d..a5ffcbb20cc0 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -57,6 +57,9 @@ EXPORT_SYMBOL_GPL(xen_start_info); struct shared_info xen_dummy_shared_info; +__read_mostly int xen_have_vector_callback; +EXPORT_SYMBOL_GPL(xen_have_vector_callback); + /* * Point at some empty memory to start with. We map the real shared_info * page as soon as fixmap is up and running. diff --git a/arch/x86/xen/enlighten_hvm.c b/arch/x86/xen/enlighten_hvm.c index 078c512b8720..a6d014f47e52 100644 --- a/arch/x86/xen/enlighten_hvm.c +++ b/arch/x86/xen/enlighten_hvm.c @@ -18,9 +18,6 @@ #include "mmu.h" #include "smp.h" -__read_mostly int xen_have_vector_callback; -EXPORT_SYMBOL_GPL(xen_have_vector_callback); - void __ref xen_hvm_init_shared_info(void) { int cpu; |