Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'x86_asm_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 asm updates from Borislav Petkov:
"Annotate new MMIO-accessing insn wrappers' arguments with __iomem"

* tag 'x86_asm_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/asm: Add a missing __iomem annotation in enqcmds()
x86/asm: Annotate movdir64b()'s dst argument with __iomem

+3 -3
+3 -3
arch/x86/include/asm/special_insns.h
··· 243 243 } 244 244 245 245 /* The dst parameter must be 64-bytes aligned */ 246 - static inline void movdir64b(void *dst, const void *src) 246 + static inline void movdir64b(void __iomem *dst, const void *src) 247 247 { 248 248 const struct { char _[64]; } *__src = src; 249 - struct { char _[64]; } *__dst = dst; 249 + struct { char _[64]; } __iomem *__dst = dst; 250 250 251 251 /* 252 252 * MOVDIR64B %(rdx), rax. ··· 286 286 static inline int enqcmds(void __iomem *dst, const void *src) 287 287 { 288 288 const struct { char _[64]; } *__src = src; 289 - struct { char _[64]; } *__dst = dst; 289 + struct { char _[64]; } __iomem *__dst = dst; 290 290 int zf; 291 291 292 292 /*