From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Wed, 18 Mar 2020 21:34:20 +0000 (+0000)
Subject: x86/ucode: Remove declarations for non-external functions
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~520
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0fde0493d7105ff8d8ffc07820dd3cb10035c51a;p=xen.git

x86/ucode: Remove declarations for non-external functions

Neither microcode_free_patch() nor early_microcode_update_cpu() have external
callers.  Make them static.

early_microcode_update_cpu()'s sole caller is following a use of
microcode_ops, making the error path dead.  Drop it as well.

No functional change.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/arch/x86/microcode.c b/xen/arch/x86/microcode.c
index 6907b312cf..27a88c6826 100644
--- a/xen/arch/x86/microcode.c
+++ b/xen/arch/x86/microcode.c
@@ -250,7 +250,7 @@ static struct microcode_patch *parse_blob(const char *buf, size_t len)
     return NULL;
 }
 
-void microcode_free_patch(struct microcode_patch *microcode_patch)
+static void microcode_free_patch(struct microcode_patch *microcode_patch)
 {
     microcode_ops->free_patch(microcode_patch->mc);
     xfree(microcode_patch);
@@ -763,16 +763,13 @@ int microcode_update_one(bool start_update)
 }
 
 /* BSP calls this function to parse ucode blob and then apply an update. */
-int __init early_microcode_update_cpu(void)
+static int __init early_microcode_update_cpu(void)
 {
     int rc = 0;
     const void *data = NULL;
     size_t len;
     struct microcode_patch *patch;
 
-    if ( !microcode_ops )
-        return -ENOSYS;
-
     if ( ucode_blob.size )
     {
         len = ucode_blob.size;
diff --git a/xen/include/asm-x86/microcode.h b/xen/include/asm-x86/microcode.h
index 7d5a1f8e8a..1a2bbacc6c 100644
--- a/xen/include/asm-x86/microcode.h
+++ b/xen/include/asm-x86/microcode.h
@@ -41,6 +41,4 @@ struct cpu_signature {
 DECLARE_PER_CPU(struct cpu_signature, cpu_sig);
 extern const struct microcode_ops *microcode_ops;
 
-void microcode_free_patch(struct microcode_patch *patch);
-
 #endif /* ASM_X86__MICROCODE_H */
diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h
index b2b19a02cd..895c7032b9 100644
--- a/xen/include/asm-x86/processor.h
+++ b/xen/include/asm-x86/processor.h
@@ -581,7 +581,6 @@ int guest_wrmsr_xen(struct vcpu *v, uint32_t idx, uint64_t val);
 
 void microcode_set_module(unsigned int);
 int microcode_update(XEN_GUEST_HANDLE_PARAM(const_void), unsigned long len);
-int early_microcode_update_cpu(void);
 int early_microcode_init(void);
 int microcode_update_one(bool start_update);
 int microcode_init_intel(void);