2019-09-18 06:25:50

by Tony W Wang-oc

Subject: [PATCH v4 2/4] x86/mce: Make 3 functions non-static

These functions are declared static and cannot be used in others
.c source file. this commit removes the static attribute and adds
the declaration to the header for these functions.

Signed-off-by: Tony W Wang-oc <[email protected]>
---
arch/x86/kernel/cpu/mce/intel.c | 6 +++---
arch/x86/kernel/cpu/mce/internal.h | 6 ++++++
2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/cpu/mce/intel.c b/arch/x86/kernel/cpu/mce/intel.c
index 88cd959..70799a5 100644
--- a/arch/x86/kernel/cpu/mce/intel.c
+++ b/arch/x86/kernel/cpu/mce/intel.c
@@ -423,7 +423,7 @@ void cmci_disable_bank(int bank)
raw_spin_unlock_irqrestore(&cmci_discover_lock, flags);
}

-static void intel_init_cmci(void)
+void intel_init_cmci(void)
{
int banks;

@@ -442,7 +442,7 @@ static void intel_init_cmci(void)
cmci_recheck();
}

-static void intel_init_lmce(void)
+void intel_init_lmce(void)
{
u64 val;

@@ -455,7 +455,7 @@ static void intel_init_lmce(void)
wrmsrl(MSR_IA32_MCG_EXT_CTL, val | MCG_EXT_CTL_LMCE_EN);
}

-static void intel_clear_lmce(void)
+void intel_clear_lmce(void)
{
u64 val;

diff --git a/arch/x86/kernel/cpu/mce/internal.h b/arch/x86/kernel/cpu/mce/internal.h
index 43031db..842b273 100644
--- a/arch/x86/kernel/cpu/mce/internal.h
+++ b/arch/x86/kernel/cpu/mce/internal.h
@@ -45,11 +45,17 @@ unsigned long cmci_intel_adjust_timer(unsigned long interval);
bool mce_intel_cmci_poll(void);
void mce_intel_hcpu_update(unsigned long cpu);
void cmci_disable_bank(int bank);
+void intel_init_cmci(void);
+void intel_init_lmce(void);
+void intel_clear_lmce(void);
#else
# define cmci_intel_adjust_timer mce_adjust_timer_default
static inline bool mce_intel_cmci_poll(void) { return false; }
static inline void mce_intel_hcpu_update(unsigned long cpu) { }
static inline void cmci_disable_bank(int bank) { }
+static inline void intel_init_cmci(void) { }
+static inline void intel_init_lmce(void) { }
+static inline void intel_clear_lmce(void) { }
#endif

void mce_timer_kick(unsigned long interval);
--
2.7.4

2019-09-30 16:27:16

by Borislav Petkov

Subject: Re: [PATCH v4 2/4] x86/mce: Make 3 functions non-static

On Wed, Sep 18, 2019 at 02:19:31PM +0800, Tony W Wang-oc wrote:
> These functions are declared static and cannot be used in others
> .c source file. this commit removes the static attribute and adds
> the declaration to the header for these functions.
>
> Signed-off-by: Tony W Wang-oc <[email protected]>
> ---
> arch/x86/kernel/cpu/mce/intel.c | 6 +++---
> arch/x86/kernel/cpu/mce/internal.h | 6 ++++++
> 2 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/mce/intel.c b/arch/x86/kernel/cpu/mce/intel.c
> index 88cd959..70799a5 100644
> --- a/arch/x86/kernel/cpu/mce/intel.c
> +++ b/arch/x86/kernel/cpu/mce/intel.c
> @@ -423,7 +423,7 @@ void cmci_disable_bank(int bank)
> raw_spin_unlock_irqrestore(&cmci_discover_lock, flags);
> }
>
> -static void intel_init_cmci(void)
> +void intel_init_cmci(void)
> {
> int banks;
>
> @@ -442,7 +442,7 @@ static void intel_init_cmci(void)
> cmci_recheck();
> }
>
> -static void intel_init_lmce(void)
> +void intel_init_lmce(void)
> {
> u64 val;
>
> @@ -455,7 +455,7 @@ static void intel_init_lmce(void)
> wrmsrl(MSR_IA32_MCG_EXT_CTL, val | MCG_EXT_CTL_LMCE_EN);
> }
>
> -static void intel_clear_lmce(void)
> +void intel_clear_lmce(void)
> {
> u64 val;
>
> diff --git a/arch/x86/kernel/cpu/mce/internal.h b/arch/x86/kernel/cpu/mce/internal.h
> index 43031db..842b273 100644
> --- a/arch/x86/kernel/cpu/mce/internal.h
> +++ b/arch/x86/kernel/cpu/mce/internal.h
> @@ -45,11 +45,17 @@ unsigned long cmci_intel_adjust_timer(unsigned long interval);
> bool mce_intel_cmci_poll(void);
> void mce_intel_hcpu_update(unsigned long cpu);
> void cmci_disable_bank(int bank);
> +void intel_init_cmci(void);
> +void intel_init_lmce(void);
> +void intel_clear_lmce(void);
> #else
> # define cmci_intel_adjust_timer mce_adjust_timer_default
> static inline bool mce_intel_cmci_poll(void) { return false; }
> static inline void mce_intel_hcpu_update(unsigned long cpu) { }
> static inline void cmci_disable_bank(int bank) { }
> +static inline void intel_init_cmci(void) { }
> +static inline void intel_init_lmce(void) { }
> +static inline void intel_clear_lmce(void) { }
> #endif
>
> void mce_timer_kick(unsigned long interval);
> --

I don't think you understood what I meant last time:

"This can easily be missed because you're exporting them in one patch
and using them in another. Do the exports in the same patch where you
use them for the first time."

Anyway, I dropped this patch and exported the functions in the
respective patches where you use the functions.

--
Regards/Gruss,
Boris.

https://people.kernel.org/tglx/notes-about-netiquette