diff options
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/xen/page.h | 5 | ||||
| -rw-r--r-- | arch/x86/include/asm/xen/pci.h | 16 |
2 files changed, 19 insertions, 2 deletions
diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h index c61934fbf22a..64a619d47d34 100644 --- a/arch/x86/include/asm/xen/page.h +++ b/arch/x86/include/asm/xen/page.h | |||
| @@ -47,8 +47,9 @@ extern bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn); | |||
| 47 | extern unsigned long set_phys_range_identity(unsigned long pfn_s, | 47 | extern unsigned long set_phys_range_identity(unsigned long pfn_s, |
| 48 | unsigned long pfn_e); | 48 | unsigned long pfn_e); |
| 49 | 49 | ||
| 50 | extern int m2p_add_override(unsigned long mfn, struct page *page); | 50 | extern int m2p_add_override(unsigned long mfn, struct page *page, |
| 51 | extern int m2p_remove_override(struct page *page); | 51 | bool clear_pte); |
| 52 | extern int m2p_remove_override(struct page *page, bool clear_pte); | ||
| 52 | extern struct page *m2p_find_override(unsigned long mfn); | 53 | extern struct page *m2p_find_override(unsigned long mfn); |
| 53 | extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn); | 54 | extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn); |
| 54 | 55 | ||
diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h index aa8620989162..4fbda9a3f339 100644 --- a/arch/x86/include/asm/xen/pci.h +++ b/arch/x86/include/asm/xen/pci.h | |||
| @@ -15,10 +15,26 @@ static inline int pci_xen_hvm_init(void) | |||
| 15 | #endif | 15 | #endif |
| 16 | #if defined(CONFIG_XEN_DOM0) | 16 | #if defined(CONFIG_XEN_DOM0) |
| 17 | void __init xen_setup_pirqs(void); | 17 | void __init xen_setup_pirqs(void); |
| 18 | int xen_find_device_domain_owner(struct pci_dev *dev); | ||
| 19 | int xen_register_device_domain_owner(struct pci_dev *dev, uint16_t domain); | ||
| 20 | int xen_unregister_device_domain_owner(struct pci_dev *dev); | ||
| 18 | #else | 21 | #else |
| 19 | static inline void __init xen_setup_pirqs(void) | 22 | static inline void __init xen_setup_pirqs(void) |
| 20 | { | 23 | { |
| 21 | } | 24 | } |
| 25 | static inline int xen_find_device_domain_owner(struct pci_dev *dev) | ||
| 26 | { | ||
| 27 | return -1; | ||
| 28 | } | ||
| 29 | static inline int xen_register_device_domain_owner(struct pci_dev *dev, | ||
| 30 | uint16_t domain) | ||
| 31 | { | ||
| 32 | return -1; | ||
| 33 | } | ||
| 34 | static inline int xen_unregister_device_domain_owner(struct pci_dev *dev) | ||
| 35 | { | ||
| 36 | return -1; | ||
| 37 | } | ||
| 22 | #endif | 38 | #endif |
| 23 | 39 | ||
| 24 | #if defined(CONFIG_PCI_MSI) | 40 | #if defined(CONFIG_PCI_MSI) |
