Skip to content

Commit f018fca

Browse files
ptesarikbp3tk0v
authored andcommitted
x86/tsx: Make tsx_ctrl_state static
Move all definitions related to tsx_ctrl_state to tsx.c. They are never referenced outside this file. No functional change. Signed-off-by: Petr Tesarik <ptesarik@suse.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Reviewed-by: Nikolay Borisov <nik.borisov@suse.com> Link: https://lore.kernel.org/all/cover.1758906115.git.ptesarik@suse.com
1 parent 211ddde commit f018fca

2 files changed

Lines changed: 8 additions & 10 deletions

File tree

arch/x86/kernel/cpu/cpu.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,6 @@ extern const struct cpu_dev *const __x86_cpu_dev_start[],
4242
*const __x86_cpu_dev_end[];
4343

4444
#ifdef CONFIG_CPU_SUP_INTEL
45-
enum tsx_ctrl_states {
46-
TSX_CTRL_ENABLE,
47-
TSX_CTRL_DISABLE,
48-
TSX_CTRL_RTM_ALWAYS_ABORT,
49-
TSX_CTRL_NOT_SUPPORTED,
50-
};
51-
52-
extern __ro_after_init enum tsx_ctrl_states tsx_ctrl_state;
53-
5445
extern void __init tsx_init(void);
5546
void tsx_ap_init(void);
5647
void intel_unlock_cpuid_leafs(struct cpuinfo_x86 *c);

arch/x86/kernel/cpu/tsx.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,14 @@
1919
#undef pr_fmt
2020
#define pr_fmt(fmt) "tsx: " fmt
2121

22-
enum tsx_ctrl_states tsx_ctrl_state __ro_after_init = TSX_CTRL_NOT_SUPPORTED;
22+
enum tsx_ctrl_states {
23+
TSX_CTRL_ENABLE,
24+
TSX_CTRL_DISABLE,
25+
TSX_CTRL_RTM_ALWAYS_ABORT,
26+
TSX_CTRL_NOT_SUPPORTED,
27+
};
28+
29+
static enum tsx_ctrl_states tsx_ctrl_state __ro_after_init = TSX_CTRL_NOT_SUPPORTED;
2330

2431
static void tsx_disable(void)
2532
{

0 commit comments

Comments
 (0)