Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'x86_cleanups_for_v6.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Borislav Petkov:
- The mandatory pile of cleanups the cat drags in every merge window
* tag 'x86_cleanups_for_v6.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/boot: Clean up whitespace in a20.c
x86/mm: Delete disabled debug code
x86/{boot,mtrr}: Remove unused function declarations
x86/percpu: Use BIT_WORD() and BIT_MASK() macros
x86/cpufeatures: Correct LKGS feature flag description
x86/idtentry: Add missing '*' to kernel-doc lines
+12
-20
+5
-5
arch/x86/boot/a20.c
+5
-5
arch/x86/boot/a20.c
···
135
135
(legacy free, etc.) */
136
136
if (a20_test_short())
137
137
return 0;
138
-
138
+
139
139
/* Next, try the BIOS (INT 0x15, AX=0x2401) */
140
140
enable_a20_bios();
141
141
if (a20_test_short())
142
142
return 0;
143
-
143
+
144
144
/* Try enabling A20 through the keyboard controller */
145
145
kbc_err = empty_8042();
146
146
147
147
if (a20_test_short())
148
148
return 0; /* BIOS worked, but with delayed reaction */
149
-
149
+
150
150
if (!kbc_err) {
151
151
enable_a20_kbc();
152
152
if (a20_test_long())
153
153
return 0;
154
154
}
155
-
155
+
156
156
/* Finally, try enabling the "fast A20 gate" */
157
157
enable_a20_fast();
158
158
if (a20_test_long())
159
159
return 0;
160
160
}
161
-
161
+
162
162
return -1;
163
163
}
-2
arch/x86/boot/boot.h
-2
arch/x86/boot/boot.h
···
193
193
194
194
void copy_to_fs(addr_t dst, void *src, size_t len);
195
195
void *copy_from_fs(void *dst, addr_t src, size_t len);
196
-
void copy_to_gs(addr_t dst, void *src, size_t len);
197
-
void *copy_from_gs(void *dst, addr_t src, size_t len);
198
196
199
197
/* a20.c */
200
198
int enable_a20(void);
+1
-1
arch/x86/include/asm/cpufeatures.h
+1
-1
arch/x86/include/asm/cpufeatures.h
···
320
320
#define X86_FEATURE_FSRS (12*32+11) /* Fast short REP STOSB */
321
321
#define X86_FEATURE_FSRC (12*32+12) /* Fast short REP {CMPSB,SCASB} */
322
322
#define X86_FEATURE_FRED (12*32+17) /* "fred" Flexible Return and Event Delivery */
323
-
#define X86_FEATURE_LKGS (12*32+18) /* Load "kernel" (userspace) GS */
323
+
#define X86_FEATURE_LKGS (12*32+18) /* Like MOV_GS except MSR_KERNEL_GS_BASE = GS.base */
324
324
#define X86_FEATURE_WRMSRNS (12*32+19) /* Non-serializing WRMSR */
325
325
#define X86_FEATURE_AMX_FP16 (12*32+21) /* AMX fp16 Support */
326
326
#define X86_FEATURE_AVX_IFMA (12*32+23) /* Support for VPMADD52[H,L]UQ */
+2
-2
arch/x86/include/asm/idtentry.h
+2
-2
arch/x86/include/asm/idtentry.h
···
393
393
394
394
/**
395
395
* DEFINE_IDTENTRY_VC_KERNEL - Emit code for VMM communication handler
396
-
when raised from kernel mode
396
+
* when raised from kernel mode
397
397
* @func: Function name of the entry point
398
398
*
399
399
* Maps to DEFINE_IDTENTRY_RAW_ERRORCODE
···
403
403
404
404
/**
405
405
* DEFINE_IDTENTRY_VC_USER - Emit code for VMM communication handler
406
-
when raised from user mode
406
+
* when raised from user mode
407
407
* @func: Function name of the entry point
408
408
*
409
409
* Maps to DEFINE_IDTENTRY_RAW_ERRORCODE
+3
-2
arch/x86/include/asm/percpu.h
+3
-2
arch/x86/include/asm/percpu.h
···
23
23
#else /* !__ASSEMBLY__: */
24
24
25
25
#include <linux/args.h>
26
+
#include <linux/bits.h>
26
27
#include <linux/build_bug.h>
27
28
#include <linux/stringify.h>
28
29
#include <asm/asm.h>
···
573
572
#define x86_this_cpu_constant_test_bit(_nr, _var) \
574
573
({ \
575
574
unsigned long __percpu *addr__ = \
576
-
(unsigned long __percpu *)&(_var) + ((_nr) / BITS_PER_LONG); \
575
+
(unsigned long __percpu *)&(_var) + BIT_WORD(_nr); \
577
576
\
578
-
!!((1UL << ((_nr) % BITS_PER_LONG)) & raw_cpu_read(*addr__)); \
577
+
!!(BIT_MASK(_nr) & raw_cpu_read(*addr__)); \
579
578
})
580
579
581
580
#define x86_this_cpu_variable_test_bit(_nr, _var) \
-4
arch/x86/kernel/cpu/mtrr/mtrr.h
-4
arch/x86/kernel/cpu/mtrr/mtrr.h
···
46
46
u32 ccr3;
47
47
};
48
48
49
-
void set_mtrr_done(struct set_mtrr_context *ctxt);
50
-
void set_mtrr_cache_disable(struct set_mtrr_context *ctxt);
51
-
void set_mtrr_prepare_save(struct set_mtrr_context *ctxt);
52
-
53
49
void fill_mtrr_var_range(unsigned int index,
54
50
u32 base_lo, u32 base_hi, u32 mask_lo, u32 mask_hi);
55
51
bool get_mtrr_state(void);
-3
arch/x86/mm/init_64.c
-3
arch/x86/mm/init_64.c
···
504
504
continue;
505
505
}
506
506
507
-
if (0)
508
-
pr_info(" pte=%p addr=%lx pte=%016lx\n", pte, paddr,
509
-
pfn_pte(paddr >> PAGE_SHIFT, PAGE_KERNEL).pte);
510
507
pages++;
511
508
set_pte_init(pte, pfn_pte(paddr >> PAGE_SHIFT, prot), init);
512
509
paddr_last = (paddr & PAGE_MASK) + PAGE_SIZE;
+1
-1
tools/arch/x86/include/asm/cpufeatures.h
+1
-1
tools/arch/x86/include/asm/cpufeatures.h
···
320
320
#define X86_FEATURE_FSRS (12*32+11) /* Fast short REP STOSB */
321
321
#define X86_FEATURE_FSRC (12*32+12) /* Fast short REP {CMPSB,SCASB} */
322
322
#define X86_FEATURE_FRED (12*32+17) /* "fred" Flexible Return and Event Delivery */
323
-
#define X86_FEATURE_LKGS (12*32+18) /* Load "kernel" (userspace) GS */
323
+
#define X86_FEATURE_LKGS (12*32+18) /* Like MOV_GS except MSR_KERNEL_GS_BASE = GS.base */
324
324
#define X86_FEATURE_WRMSRNS (12*32+19) /* Non-serializing WRMSR */
325
325
#define X86_FEATURE_AMX_FP16 (12*32+21) /* AMX fp16 Support */
326
326
#define X86_FEATURE_AVX_IFMA (12*32+23) /* Support for VPMADD52[H,L]UQ */