diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2025-05-19 11:12:36 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2025-05-19 11:12:36 -0300 |
| commit | 4d4eb38795b5cbc66103ae2582bccead5bf0f736 (patch) | |
| tree | 8048284284f48cb7c97a5c4fef0fc712125bbffa /arch/x86/kernel/cpu/microcode/internal.h | |
| parent | 8cdf00b843ea3ca0e920176937bbc906b0b5bb04 (diff) | |
| parent | a5806cd506af5a7c19bcd596e4708b5c464bfd21 (diff) | |
| download | linux-4d4eb38795b5cbc66103ae2582bccead5bf0f736.tar.gz linux-4d4eb38795b5cbc66103ae2582bccead5bf0f736.zip | |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
To pick up changes for other tools/ libraries used by perf and for
header synchronization with the kernel sources originals.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'arch/x86/kernel/cpu/microcode/internal.h')
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/internal.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/microcode/internal.h b/arch/x86/kernel/cpu/microcode/internal.h index 5df621752fef..50a9702ae4e2 100644 --- a/arch/x86/kernel/cpu/microcode/internal.h +++ b/arch/x86/kernel/cpu/microcode/internal.h @@ -94,7 +94,6 @@ static inline unsigned int x86_cpuid_family(void) return x86_family(eax); } -extern bool dis_ucode_ldr; extern bool force_minrev; #ifdef CONFIG_CPU_SUP_AMD |