Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'x86_asm_for_v6.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 asm update from Borislav Petkov:
- Fix RDPID's output operand size in inline asm and use the insn
mnemonic because the minimum binutils version supports it
* tag 'x86_asm_for_v6.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/vdso: Fix output operand size of RDPID
+4
-4
+4
-4
arch/x86/include/asm/segment.h
+4
-4
arch/x86/include/asm/segment.h
···
244
244
245
245
static inline void vdso_read_cpunode(unsigned *cpu, unsigned *node)
246
246
{
247
-
unsigned int p;
247
+
unsigned long p;
248
248
249
249
/*
250
250
* Load CPU and node number from the GDT. LSL is faster than RDTSCP
···
254
254
*
255
255
* If RDPID is available, use it.
256
256
*/
257
-
alternative_io ("lsl %[seg],%[p]",
258
-
".byte 0xf3,0x0f,0xc7,0xf8", /* RDPID %eax/rax */
257
+
alternative_io ("lsl %[seg],%k[p]",
258
+
"rdpid %[p]",
259
259
X86_FEATURE_RDPID,
260
-
[p] "=a" (p), [seg] "r" (__CPUNODE_SEG));
260
+
[p] "=r" (p), [seg] "r" (__CPUNODE_SEG));
261
261
262
262
if (cpu)
263
263
*cpu = (p & VDSO_CPUNODE_MASK);