moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2021-02-20 20:50:27 -08:00
parent 26a30ffff9 5c99720b28
commit 2c405d1ab8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/include/asm/special_insns.h
View File

@@ -243,10 +243,10 @@ static inline void serialize(void)
} }
/* The dst parameter must be 64-bytes aligned */ /* 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; const struct { char _[64]; } *__src = src;
struct { char _[64]; } *__dst = dst; struct { char _[64]; } __iomem *__dst = dst;
/* /*
* MOVDIR64B %(rdx), rax. * 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) static inline int enqcmds(void __iomem *dst, const void *src)
{ {
const struct { char _[64]; } *__src = src; const struct { char _[64]; } *__src = src;
struct { char _[64]; } *__dst = dst; struct { char _[64]; } __iomem *__dst = dst;
int zf; int zf;
/* /*