On Tue, Aug 14, 2018 at 07:14:46PM -0700, Guenter Roeck wrote:
> From: Jiri Kosina <jkosina@xxxxxxx>
>
> commit 6c26fcd2abfe0a56bbd95271fce02df2896cfd24 upstream
>
> pfn_modify_allowed() and arch_has_pfn_modify_check() are outside of the
> !__ASSEMBLY__ section in include/asm-generic/pgtable.h, which confuses
> assembler on archs that don't have __HAVE_ARCH_PFN_MODIFY_ALLOWED (e.g.
> ia64) and breaks build:
>
> include/asm-generic/pgtable.h: Assembler messages:
> include/asm-generic/pgtable.h:538: Error: Unknown opcode `static inline bool pfn_modify_allowed(unsigned long pfn,pgprot_t prot)'
> include/asm-generic/pgtable.h:540: Error: Unknown opcode `return true'
> include/asm-generic/pgtable.h:543: Error: Unknown opcode `static inline bool arch_has_pfn_modify_check(void)'
> include/asm-generic/pgtable.h:545: Error: Unknown opcode `return false'
> arch/ia64/kernel/entry.S:69: Error: `mov' does not fit into bundle
>
> Move those two static inlines into the !__ASSEMBLY__ section so that they
> don't confuse the asm build pass.
>
> Fixes: 42e4089c7890 ("x86/speculation/l1tf: Disallow non privileged high MMIO PROT_NONE mappings")
> Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> (cherry picked from commit 6c26fcd2abfe0a56bbd95271fce02df2896cfd24)
> [groeck: Context changes]
> Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> include/asm-generic/pgtable.h | 25 +++++++++++++------------
> 1 file changed, 13 insertions(+), 12 deletions(-)
Thanks for this and the other backport of this patch, now applied.
greg k-h
