From cc7f7a84191f5defc2ea4633eeea4acb4486b549 Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers@google.com>
Date: Tue, 8 Dec 2020 15:30:56 -0800
Subject: [PATCH] ANDROID: x86: entry: fix LSL open coding

Will notes that .quad is too long; while we get the right lsl
instruction, the rest of the instruction stream is incorrect.

Bug: 175018033
Fixes: e58f084735b8 ("ANDROID: x86: entry: work around LLVM_IAS=1 bug in LSL")
Reported-by: Alistair Delva <adelva@google.com>
Suggested-by: Will Deacon <will@kernel.org>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Change-Id: Ied2fd2351eee72ff95402d80cbb1cefb78c6880a
---
 arch/x86/entry/calling.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/entry/calling.h b/arch/x86/entry/calling.h
index ffc5bd73de23..4bec2597626b 100644
--- a/arch/x86/entry/calling.h
+++ b/arch/x86/entry/calling.h
@@ -367,7 +367,7 @@ For 32-bit we have the following conventions - kernel is built with
 .macro LOAD_CPU_AND_NODE_SEG_LIMIT reg:req
 	movq	$__CPUNODE_SEG, \reg
 #ifdef __clang__
-	.quad 0xc0030f48
+	.long 0xc0030f48
 #else
 	lsl	\reg, \reg
 #endif