From: Jan Beulich <jbeulich@suse.com>
Date: Mon, 13 May 2019 07:53:22 +0000 (+0200)
Subject: x86/mem-sharing: statically initialize audit list head and lock
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~2314
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9efd36b5dd563cb2af7994c4b8af6e4a9e50e765;p=xen.git

x86/mem-sharing: statically initialize audit list head and lock

There's no need to execute any instructions for doing so. Drop the then
effectively empty mem_sharing_init() altogether.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: George Dunlap <george.dunlap@citrix.com>
Acked-by: Tamas K Lengyel <tamas@tklengyel.com>
---

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 45fadbab61..5e1b061d2a 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -368,8 +368,6 @@ void __init arch_init_memory(void)
 
     efi_init_memory();
 
-    mem_sharing_init();
-
 #ifndef NDEBUG
     if ( highmem_start )
     {
diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c
index 5ac9d8f54c..03aafa57a6 100644
--- a/xen/arch/x86/mm/mem_sharing.c
+++ b/xen/arch/x86/mm/mem_sharing.c
@@ -65,8 +65,8 @@ static DEFINE_PER_CPU(pg_lock_data_t, __pld);
 
 #if MEM_SHARING_AUDIT
 
-static struct list_head shr_audit_list;
-static spinlock_t shr_audit_lock;
+static LIST_HEAD(shr_audit_list);
+static DEFINE_SPINLOCK(shr_audit_lock);
 static DEFINE_RCU_READ_LOCK(shr_audit_read_lock);
 
 /* RCU delayed free of audit list entry */
@@ -1650,13 +1650,3 @@ int mem_sharing_domctl(struct domain *d, struct xen_domctl_mem_sharing_op *mec)
 
     return rc;
 }
-
-void __init mem_sharing_init(void)
-{
-    printk("Initing memory sharing.\n");
-#if MEM_SHARING_AUDIT
-    spin_lock_init(&shr_audit_lock);
-    INIT_LIST_HEAD(&shr_audit_list);
-#endif
-}
-
diff --git a/xen/include/asm-x86/mem_sharing.h b/xen/include/asm-x86/mem_sharing.h
index 0e77b7d935..9f9f7e93e3 100644
--- a/xen/include/asm-x86/mem_sharing.h
+++ b/xen/include/asm-x86/mem_sharing.h
@@ -88,7 +88,6 @@ int mem_sharing_notify_enomem(struct domain *d, unsigned long gfn,
 int mem_sharing_memop(XEN_GUEST_HANDLE_PARAM(xen_mem_sharing_op_t) arg);
 int mem_sharing_domctl(struct domain *d, 
                        struct xen_domctl_mem_sharing_op *mec);
-void mem_sharing_init(void);
 
 /* Scans the p2m and relinquishes any shared pages, destroying 
  * those for which this domain holds the final reference.