x86/asm: Fix SETZ size enqcmds() build failure

kees · suryasaimadhu · commit d81ff5fe14a9 · 2021-09-22T19:45:48.000+02:00
When building under GCC 4.9 and 5.5: arch/x86/include/asm/special_insns.h: Assembler messages: arch/x86/include/asm/special_insns.h:286: Error: operand size mismatch for `setz' Change the type to "bool" for condition code arguments, as documented. Fixes: 7f5933f ("x86/asm: Add an enqcmds() wrapper for the ENQCMDS instruction") Co-developed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lkml.kernel.org/r/20210910223332.3224851-1-keescook@chromium.org
diff --git a/arch/x86/include/asm/special_insns.h b/arch/x86/include/asm/special_insns.h
@@ -275,7 +275,7 @@ static inline int enqcmds(void __iomem *dst, const void *src)
 {
 	const struct { char _[64]; } *__src = src;
 	struct { char _[64]; } __iomem *__dst = dst;
-	int zf;
+	bool zf;
 
 	/*
 	 * ENQCMDS %(rdx), rax

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ static inline int enqcmds(void __iomem dst, const void src)`
`275`	`275`	`{`
`276`	`276`	`const struct { char _[64]; } *__src = src;`
`277`	`277`	`struct { char _[64]; } __iomem *__dst = dst;`
`278`		`- int zf;`
	`278`	`+ bool zf;`
`279`	`279`
`280`	`280`	`/*`
`281`	`281`	`* ENQCMDS %(rdx), rax`