diff options
author | Juergen Gross <jgross@suse.com> | 2017-08-04 07:36:12 -0400 |
---|---|---|
committer | Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2017-08-31 09:45:55 -0400 |
commit | 882bbe56aed0cbb00b374454f6c069919c9228dd (patch) | |
tree | e82f71f7c8683bb7e53bc882cddeac320a8d630a | |
parent | 82616f9599a707e8225ceca6000dc5ea5aa78e11 (diff) |
xen: remove unused function xen_set_domain_pte()
The function xen_set_domain_pte() is used nowhere in the kernel.
Remove it.
Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
-rw-r--r-- | arch/x86/include/asm/xen/page.h | 2 | ||||
-rw-r--r-- | arch/x86/xen/mmu_pv.c | 20 | ||||
-rw-r--r-- | include/trace/events/xen.h | 18 |
3 files changed, 0 insertions, 40 deletions
diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h index 497f7d28c1d6..07b6531813c4 100644 --- a/arch/x86/include/asm/xen/page.h +++ b/arch/x86/include/asm/xen/page.h | |||
@@ -314,8 +314,6 @@ static inline pte_t __pte_ma(pteval_t x) | |||
314 | #define p4d_val_ma(x) ((x).p4d) | 314 | #define p4d_val_ma(x) ((x).p4d) |
315 | #endif | 315 | #endif |
316 | 316 | ||
317 | void xen_set_domain_pte(pte_t *ptep, pte_t pteval, unsigned domid); | ||
318 | |||
319 | xmaddr_t arbitrary_virt_to_machine(void *address); | 317 | xmaddr_t arbitrary_virt_to_machine(void *address); |
320 | unsigned long arbitrary_virt_to_mfn(void *vaddr); | 318 | unsigned long arbitrary_virt_to_mfn(void *vaddr); |
321 | void make_lowmem_page_readonly(void *vaddr); | 319 | void make_lowmem_page_readonly(void *vaddr); |
diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c index cab28cf2cffb..0422ee7e70b3 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c | |||
@@ -162,26 +162,6 @@ static bool xen_page_pinned(void *ptr) | |||
162 | return PagePinned(page); | 162 | return PagePinned(page); |
163 | } | 163 | } |
164 | 164 | ||
165 | void xen_set_domain_pte(pte_t *ptep, pte_t pteval, unsigned domid) | ||
166 | { | ||
167 | struct multicall_space mcs; | ||
168 | struct mmu_update *u; | ||
169 | |||
170 | trace_xen_mmu_set_domain_pte(ptep, pteval, domid); | ||
171 | |||
172 | mcs = xen_mc_entry(sizeof(*u)); | ||
173 | u = mcs.args; | ||
174 | |||
175 | /* ptep might be kmapped when using 32-bit HIGHPTE */ | ||
176 | u->ptr = virt_to_machine(ptep).maddr; | ||
177 | u->val = pte_val_ma(pteval); | ||
178 | |||
179 | MULTI_mmu_update(mcs.mc, mcs.args, 1, NULL, domid); | ||
180 | |||
181 | xen_mc_issue(PARAVIRT_LAZY_MMU); | ||
182 | } | ||
183 | EXPORT_SYMBOL_GPL(xen_set_domain_pte); | ||
184 | |||
185 | static void xen_extend_mmu_update(const struct mmu_update *update) | 165 | static void xen_extend_mmu_update(const struct mmu_update *update) |
186 | { | 166 | { |
187 | struct multicall_space mcs; | 167 | struct multicall_space mcs; |
diff --git a/include/trace/events/xen.h b/include/trace/events/xen.h index b70a38b7fa84..677e8ac2bb81 100644 --- a/include/trace/events/xen.h +++ b/include/trace/events/xen.h | |||
@@ -149,24 +149,6 @@ DECLARE_EVENT_CLASS(xen_mmu__set_pte, | |||
149 | DEFINE_XEN_MMU_SET_PTE(xen_mmu_set_pte); | 149 | DEFINE_XEN_MMU_SET_PTE(xen_mmu_set_pte); |
150 | DEFINE_XEN_MMU_SET_PTE(xen_mmu_set_pte_atomic); | 150 | DEFINE_XEN_MMU_SET_PTE(xen_mmu_set_pte_atomic); |
151 | 151 | ||
152 | TRACE_EVENT(xen_mmu_set_domain_pte, | ||
153 | TP_PROTO(pte_t *ptep, pte_t pteval, unsigned domid), | ||
154 | TP_ARGS(ptep, pteval, domid), | ||
155 | TP_STRUCT__entry( | ||
156 | __field(pte_t *, ptep) | ||
157 | __field(pteval_t, pteval) | ||
158 | __field(unsigned, domid) | ||
159 | ), | ||
160 | TP_fast_assign(__entry->ptep = ptep; | ||
161 | __entry->pteval = pteval.pte; | ||
162 | __entry->domid = domid), | ||
163 | TP_printk("ptep %p pteval %0*llx (raw %0*llx) domid %u", | ||
164 | __entry->ptep, | ||
165 | (int)sizeof(pteval_t) * 2, (unsigned long long)pte_val(native_make_pte(__entry->pteval)), | ||
166 | (int)sizeof(pteval_t) * 2, (unsigned long long)__entry->pteval, | ||
167 | __entry->domid) | ||
168 | ); | ||
169 | |||
170 | TRACE_EVENT(xen_mmu_set_pte_at, | 152 | TRACE_EVENT(xen_mmu_set_pte_at, |
171 | TP_PROTO(struct mm_struct *mm, unsigned long addr, | 153 | TP_PROTO(struct mm_struct *mm, unsigned long addr, |
172 | pte_t *ptep, pte_t pteval), | 154 | pte_t *ptep, pte_t pteval), |