1 files changed, 1 insertions, 33 deletions
diff --git a/include/linux/dma_remapping.h b/include/linux/dma_remapping.h
index 2e5a5c0b6acd..d8521662a495 100644
--- a/include/linux/dma_remapping.h
+++ b/include/linux/dma_remapping.h
@@ -9,39 +9,7 @@
 #define VTD_PAGE_MASK           (((u64)-1) << VTD_PAGE_SHIFT)
 #define VTD_PAGE_ALIGN(addr)    (((addr) + VTD_PAGE_SIZE - 1) & VTD_PAGE_MASK)
-/*
+struct root_entry;
- * 0: Present
- * 1-11: Reserved
- * 12-63: Context Ptr (12 - (haw-1))
- * 64-127: Reserved
- */
-struct root_entry {
-        u64     val;
-        u64     rsvd1;
-};
-#define ROOT_ENTRY_NR (VTD_PAGE_SIZE/sizeof(struct root_entry))
-static inline bool root_present(struct root_entry *root)
-{
-        return (root->val & 1);
-}
-static inline void set_root_present(struct root_entry *root)
-{
-        root->val |= 1;
-}
-static inline void set_root_value(struct root_entry *root, unsigned long value)
-{
-        root->val |= value & VTD_PAGE_MASK;
-}
-struct context_entry;
-static inline struct context_entry *
-get_context_addr_from_root(struct root_entry *root)
-{
-        return (struct context_entry *)
-                (root_present(root)?phys_to_virt(
-                root->val & VTD_PAGE_MASK) :
-                NULL);
-}
 /*
 * low 64 bits:

diff --git a/include/linux/dma_remapping.h b/include/linux/dma_remapping.h index 2e5a5c0b6acd..d8521662a495 100644 --- a/include/linux/dma_remapping.h +++ b/include/linux/dma_remapping.h
@@ -9,39 +9,7 @@
9	#define VTD_PAGE_MASK (((u64)-1) << VTD_PAGE_SHIFT)	9	#define VTD_PAGE_MASK (((u64)-1) << VTD_PAGE_SHIFT)
10	#define VTD_PAGE_ALIGN(addr) (((addr) + VTD_PAGE_SIZE - 1) & VTD_PAGE_MASK)	10	#define VTD_PAGE_ALIGN(addr) (((addr) + VTD_PAGE_SIZE - 1) & VTD_PAGE_MASK)
11		11
12	/*	12	struct root_entry;
13	* 0: Present
14	* 1-11: Reserved
15	* 12-63: Context Ptr (12 - (haw-1))
16	* 64-127: Reserved
17	*/
18	struct root_entry {
19	u64 val;
20	u64 rsvd1;
21	};
22	#define ROOT_ENTRY_NR (VTD_PAGE_SIZE/sizeof(struct root_entry))
23	static inline bool root_present(struct root_entry *root)
24	{
25	return (root->val & 1);
26	}
27	static inline void set_root_present(struct root_entry *root)
28	{
29	root->val \|= 1;
30	}
31	static inline void set_root_value(struct root_entry *root, unsigned long value)
32	{
33	root->val \|= value & VTD_PAGE_MASK;
34	}
35
36	struct context_entry;
37	static inline struct context_entry *
38	get_context_addr_from_root(struct root_entry *root)
39	{
40	return (struct context_entry *)
41	(root_present(root)?phys_to_virt(
42	root->val & VTD_PAGE_MASK) :
43	NULL);
44	}
45		13
46	/*	14	/*
47	* low 64 bits:	15	* low 64 bits: