xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: Setting up GS before calling __restore_processor_state."

Browse Source 
This reverts commit 6767ebd98b.

It breaks the build in the 5.10.215 and we shouldn't need it anymore
because of the changes done in this area in that release.

Bug: 166163480
Cc: Haitao Shan <hshan@google.com>
Fixes: e2e4e7b4ae ("Linux 5.10.215")
Change-Id: I303e5e02349aa5619382f529933363e2cceed66a
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-05-22 14:01:39 +00:00
parent be9f128eaf
commit 48fcb2dadf
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/x86/power/cpu.c
View File

@@ -279,19 +279,6 @@ static void notrace __restore_processor_state(struct saved_context *ctxt)
/* Needed by apm.c */ /* Needed by apm.c */
void notrace restore_processor_state(void) void notrace restore_processor_state(void)
{ {
#ifdef __clang__
// The following code snippet is copied from __restore_processor_state.
// Its purpose is to prepare GS segment before the function is called.
// Since the function is compiled with SCS on, it will use GS at its
// entry.
// TODO: Hack to be removed later when compiler bug is fixed.
#ifdef CONFIG_X86_64
wrmsrl(MSR_GS_BASE, saved_context.kernelmode_gs_base);
#else
loadsegment(fs, __KERNEL_PERCPU);
loadsegment(gs, __KERNEL_STACK_CANARY);
#endif
#endif
__restore_processor_state(&saved_context); __restore_processor_state(&saved_context);
} }
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32