projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus-4.2-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
include
/
asm
/
xen
/
hypervisor.h
diff --git
a/arch/arm/include/asm/xen/hypervisor.h
b/arch/arm/include/asm/xen/hypervisor.h
index 1317ee40f4dfd6051daa9efaa77e52dfcee37fe5..04ff8e7b37dfd914e8319b0727aa3e8682efa0dc 100644
(file)
--- a/
arch/arm/include/asm/xen/hypervisor.h
+++ b/
arch/arm/include/asm/xen/hypervisor.h
@@
-1,6
+1,8
@@
#ifndef _ASM_ARM_XEN_HYPERVISOR_H
#define _ASM_ARM_XEN_HYPERVISOR_H
#ifndef _ASM_ARM_XEN_HYPERVISOR_H
#define _ASM_ARM_XEN_HYPERVISOR_H
+#include <linux/init.h>
+
extern struct shared_info *HYPERVISOR_shared_info;
extern struct start_info *xen_start_info;
extern struct shared_info *HYPERVISOR_shared_info;
extern struct start_info *xen_start_info;
@@
-18,4
+20,10
@@
static inline enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
extern struct dma_map_ops *xen_dma_ops;
extern struct dma_map_ops *xen_dma_ops;
+#ifdef CONFIG_XEN
+void __init xen_early_init(void);
+#else
+static inline void xen_early_init(void) { return; }
+#endif
+
#endif /* _ASM_ARM_XEN_HYPERVISOR_H */
#endif /* _ASM_ARM_XEN_HYPERVISOR_H */