diff options
| author | Greg Hackmann <ghackmann@google.com> | 2017-10-16 15:28:15 -0700 |
|---|---|---|
| committer | Greg Hackmann <ghackmann@google.com> | 2017-10-16 15:28:21 -0700 |
| commit | 02049f8843cbca96b6bf0821c648071666af89a7 (patch) | |
| tree | fa975cff0515664473f4ac427f69c2657fb7e1ed /arch/x86/boot/compressed/aslr.c | |
| parent | ec888d46d8993b2bf205ed375e538a3819c23659 (diff) | |
| parent | 20ea95166e628343b388139f1b521c50f5fd0b44 (diff) | |
Merge branch 'android-4.4-llvm' into android-4.4
Change-Id: Ieb23e9018ae152706f1980fcd5cbd1dffb4d8be6
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Diffstat (limited to 'arch/x86/boot/compressed/aslr.c')
| -rw-r--r-- | arch/x86/boot/compressed/aslr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/aslr.c b/arch/x86/boot/compressed/aslr.c index 6a9b96b4624d..4a5fbd2da658 100644 --- a/arch/x86/boot/compressed/aslr.c +++ b/arch/x86/boot/compressed/aslr.c @@ -94,7 +94,7 @@ static unsigned long get_random_long(void) } /* Circular multiply for better bit diffusion */ - asm("mul %3" + asm(_ASM_MUL "%3" : "=a" (random), "=d" (raw) : "a" (random), "rm" (mix_const)); random += raw; |