Commit 2c405d1a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 26a30fff 5c99720b

arch/x86/include/asm/special_insns.h

+3 −3
Original line number Diff line number Diff line
@@ -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;



	/*