From: Ingo Molnar Date: Tue, 12 Mar 2024 08:49:52 +0000 (+0100) Subject: Merge branch 'linus' into x86/boot, to resolve conflict X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2e2bc42c8381d2c0e9604b59e49264821da29368;p=people%2Faperard%2Flinux.git Merge branch 'linus' into x86/boot, to resolve conflict There's a new conflict with Linus's upstream tree, because in the following merge conflict resolution in : 38b334fc767e Merge tag 'x86_sev_for_v6.9_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Linus has resolved the conflicting placement of 'cc_mask' better than the original commit: 1c811d403afd x86/sev: Fix position dependent variable references in startup code ... which was also done by an internal merge resolution: 2e5fc4786b7a Merge branch 'x86/sev' into x86/boot, to resolve conflicts and to pick up dependent tree But Linus is right in 38b334fc767e, the 'cc_mask' declaration is sufficient within the #ifdef CONFIG_ARCH_HAS_CC_PLATFORM block. So instead of forcing Linus to do the same resolution again, merge in Linus's tree and follow his conflict resolution. Conflicts: arch/x86/include/asm/coco.h Signed-off-by: Ingo Molnar --- 2e2bc42c8381d2c0e9604b59e49264821da29368 diff --cc arch/x86/kernel/head_64.S index 79f7c342e3da0,3dbd05f938599..d8198fbd70e54 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@@ -65,8 -67,10 +66,8 @@@ SYM_CODE_START_NOALIGN(startup_64 mov %rsi, %r15 /* Set up the stack for verify_cpu() */ - leaq (__end_init_task - PTREGS_SIZE)(%rip), %rsp + leaq (__end_init_task - TOP_OF_KERNEL_STACK_PADDING - PTREGS_SIZE)(%rip), %rsp - leaq _text(%rip), %rdi - /* Setup GSBASE to allow stack canary access for C code */ movl $MSR_GS_BASE, %ecx leaq INIT_PER_CPU_VAR(fixed_percpu_data)(%rip), %rdx