From 3c2c8d8f7f2639e319212d10cb8df5bd13098dae Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Tue, 26 Jan 2021 11:00:05 -0800 Subject: [PATCH] ANDROID: x86: entry: revert LSL workarounds This commit is a squash of the following two commits: - Revert "ANDROID: x86: entry: fix LSL open coding" This reverts commit cc7f7a84191f5defc2ea4633eeea4acb4486b549. - Revert "ANDROID: x86: entry: work around LLVM_IAS=1 bug in LSL" This reverts commit e58f084735b8abf744d61083b92172ee23d45aae. Now that the toolchain has been upgraded, we no longer need a workaround for the previous assembler bug. Bug: 141693040 Bug: 171348143 Bug: 175018033 Signed-off-by: Nick Desaulniers Change-Id: Ice3329cf58d983fac5dc8bea551a73cb58c9cba4 --- arch/x86/entry/calling.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/x86/entry/calling.h b/arch/x86/entry/calling.h index 4bec2597626b..07a9331d55e7 100644 --- a/arch/x86/entry/calling.h +++ b/arch/x86/entry/calling.h @@ -366,11 +366,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__ - .long 0xc0030f48 -#else lsl \reg, \reg -#endif .endm /*