OSDN Git Service

BACKPORT: x86/mm/kaslr: Use the _ASM_MUL macro for multiplication to work around...
authorMatthias Kaehlcke <mka@chromium.org>
Fri, 5 May 2017 16:50:49 +0000 (09:50 -0700)
committerGreg Hackmann <ghackmann@google.com>
Mon, 9 Oct 2017 21:00:13 +0000 (14:00 -0700)
commitcafc5bc76374ba807d570055be4e217572d33a49
tree17551573635533d60ede5c59f33442e5b4a15a91
parent2a3a3862527dbdba157c5973cbd231a20b20d253
BACKPORT: x86/mm/kaslr: Use the _ASM_MUL macro for multiplication to work around Clang incompatibility

The constraint "rm" allows the compiler to put mix_const into memory.
When the input operand is a memory location then MUL needs an operand
size suffix, since Clang can't infer the multiplication width from the
operand.

Add and use the _ASM_MUL macro which determines the operand size and
resolves to the NUL instruction with the corresponding suffix.

This fixes the following error when building with clang:

  CC      arch/x86/lib/kaslr.o
  /tmp/kaslr-dfe1ad.s: Assembler messages:
  /tmp/kaslr-dfe1ad.s:182: Error: no instruction mnemonic suffix given and no register operands; can't size instruction

Upstream commit: 121843eb02a6

Change-Id: I53f51839705dabeb6c950d1def3a45881294129c
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Cc: Grant Grundler <grundler@chromium.org>
Cc: Greg Hackmann <ghackmann@google.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Michael Davidson <md@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20170501224741.133938-1-mka@chromium.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Hackmann <ghackmann@google.com>
arch/x86/boot/compressed/aslr.c
arch/x86/include/asm/asm.h