diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-20 20:50:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-20 20:50:27 -0800 |
| commit | 2c405d1ab8b3103df2df541aaacc2113dc6c9fac (patch) | |
| tree | cdf4fcd060bcb50768c754aea31228c266127613 | |
| parent | Merge tag 'x86_build_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | x86/asm: Add a missing __iomem annotation in enqcmds() (diff) | |
| download | linux-dev-2c405d1ab8b3103df2df541aaacc2113dc6c9fac.tar.xz linux-dev-2c405d1ab8b3103df2df541aaacc2113dc6c9fac.zip | |
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
| -rw-r--r-- | arch/x86/include/asm/special_insns.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/asm/special_insns.h b/arch/x86/include/asm/special_insns.h index cc177b4431ae..1d3cbaef4bb7 100644 --- a/arch/x86/include/asm/special_insns.h +++ b/arch/x86/include/asm/special_insns.h @@ -243,10 +243,10 @@ static inline void serialize(void) } /* The dst parameter must be 64-bytes aligned */ -static inline void movdir64b(void *dst, const void *src) +static inline void movdir64b(void __iomem *dst, const void *src) { const struct { char _[64]; } *__src = src; - struct { char _[64]; } *__dst = dst; + struct { char _[64]; } __iomem *__dst = dst; /* * MOVDIR64B %(rdx), rax. @@ -286,7 +286,7 @@ static inline void movdir64b(void *dst, const void *src) static inline int enqcmds(void __iomem *dst, const void *src) { const struct { char _[64]; } *__src = src; - struct { char _[64]; } *__dst = dst; + struct { char _[64]; } __iomem *__dst = dst; int zf; /* |