diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pci_ids.h | 3 | ||||
-rw-r--r-- | include/xen/grant_table.h | 4 | ||||
-rw-r--r-- | include/xen/interface/grant_table.h | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 3bedcc149c84..cca2526f28d7 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -2772,3 +2772,6 @@ | |||
2772 | #define PCI_DEVICE_ID_RME_DIGI32 0x9896 | 2772 | #define PCI_DEVICE_ID_RME_DIGI32 0x9896 |
2773 | #define PCI_DEVICE_ID_RME_DIGI32_PRO 0x9897 | 2773 | #define PCI_DEVICE_ID_RME_DIGI32_PRO 0x9897 |
2774 | #define PCI_DEVICE_ID_RME_DIGI32_8 0x9898 | 2774 | #define PCI_DEVICE_ID_RME_DIGI32_8 0x9898 |
2775 | |||
2776 | #define PCI_VENDOR_ID_XEN 0x5853 | ||
2777 | #define PCI_DEVICE_ID_XEN_PLATFORM 0x0001 | ||
diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h index a40f1cd91be1..9a731706a016 100644 --- a/include/xen/grant_table.h +++ b/include/xen/grant_table.h | |||
@@ -51,6 +51,7 @@ struct gnttab_free_callback { | |||
51 | u16 count; | 51 | u16 count; |
52 | }; | 52 | }; |
53 | 53 | ||
54 | int gnttab_init(void); | ||
54 | int gnttab_suspend(void); | 55 | int gnttab_suspend(void); |
55 | int gnttab_resume(void); | 56 | int gnttab_resume(void); |
56 | 57 | ||
@@ -112,6 +113,9 @@ int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes, | |||
112 | void arch_gnttab_unmap_shared(struct grant_entry *shared, | 113 | void arch_gnttab_unmap_shared(struct grant_entry *shared, |
113 | unsigned long nr_gframes); | 114 | unsigned long nr_gframes); |
114 | 115 | ||
116 | extern unsigned long xen_hvm_resume_frames; | ||
117 | unsigned int gnttab_max_grant_frames(void); | ||
118 | |||
115 | #define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr)) | 119 | #define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr)) |
116 | 120 | ||
117 | #endif /* __ASM_GNTTAB_H__ */ | 121 | #endif /* __ASM_GNTTAB_H__ */ |
diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h index 39da93c21de0..39e571796e32 100644 --- a/include/xen/interface/grant_table.h +++ b/include/xen/interface/grant_table.h | |||
@@ -28,6 +28,7 @@ | |||
28 | #ifndef __XEN_PUBLIC_GRANT_TABLE_H__ | 28 | #ifndef __XEN_PUBLIC_GRANT_TABLE_H__ |
29 | #define __XEN_PUBLIC_GRANT_TABLE_H__ | 29 | #define __XEN_PUBLIC_GRANT_TABLE_H__ |
30 | 30 | ||
31 | #include <xen/interface/xen.h> | ||
31 | 32 | ||
32 | /*********************************** | 33 | /*********************************** |
33 | * GRANT TABLE REPRESENTATION | 34 | * GRANT TABLE REPRESENTATION |