Remove preventive sfence.vma

[bjoto]

Pull request for series with
subject: Remove preventive sfence.vma
version: 1
url: https://patchwork.kernel.org/project/linux-riscv/list/?series=807901

[bjoto]

Upstream branch: 7c15934
series: https://patchwork.kernel.org/project/linux-riscv/list/?series=807901
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-riscv/list/?series=807901
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -s --3way
  stdout: 'Applying: riscv: Stop emitting preventive sfence.vma for new vmalloc mappings
Using index info to reconstruct a base tree...
M	arch/riscv/include/asm/thread_info.h
M	arch/riscv/kernel/asm-offsets.c
M	arch/riscv/kernel/entry.S
M	arch/riscv/mm/init.c
Falling back to patching base and 3-way merge...
Auto-merging arch/riscv/mm/init.c
Auto-merging arch/riscv/kernel/entry.S
Auto-merging arch/riscv/kernel/asm-offsets.c
CONFLICT (content): Merge conflict in arch/riscv/kernel/asm-offsets.c
Auto-merging arch/riscv/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/riscv/include/asm/thread_info.h
Patch failed at 0001 riscv: Stop emitting preventive sfence.vma for new vmalloc mappings
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc arch/riscv/include/asm/thread_info.h
index 574779900bfb,8fe12fa6c329..000000000000
--- a/arch/riscv/include/asm/thread_info.h
+++ b/arch/riscv/include/asm/thread_info.h
@@@ -57,20 -60,13 +57,28 @@@ struct thread_info 
  	long			user_sp;	/* User stack pointer */
  	int			cpu;
  	unsigned long		syscall_work;	/* SYSCALL_WORK_ flags */
++<<<<<<< HEAD
 +#ifdef CONFIG_SHADOW_CALL_STACK
 +	void			*scs_base;
 +	void			*scs_sp;
 +#endif
++=======
+ 	/*
+ 	 * Used in handle_exception() to save a0, a1 and a2 before knowing if we
+ 	 * can access the kernel stack.
+ 	 */
+ 	unsigned long		a0, a1, a2;
++>>>>>>> riscv: Stop emitting preventive sfence.vma for new vmalloc mappings
  };
  
 +#ifdef CONFIG_SHADOW_CALL_STACK
 +#define INIT_SCS							\
 +	.scs_base	= init_shadow_call_stack,			\
 +	.scs_sp		= init_shadow_call_stack,
 +#else
 +#define INIT_SCS
 +#endif
 +
  /*
   * macros/functions for gaining access to the thread information structure
   *
diff --cc arch/riscv/kernel/asm-offsets.c
index a03129f40c46,340c1c84560d..000000000000
--- a/arch/riscv/kernel/asm-offsets.c
+++ b/arch/riscv/kernel/asm-offsets.c
@@@ -39,11 -40,10 +41,17 @@@ void asm_offsets(void
  	OFFSET(TASK_TI_PREEMPT_COUNT, task_struct, thread_info.preempt_count);
  	OFFSET(TASK_TI_KERNEL_SP, task_struct, thread_info.kernel_sp);
  	OFFSET(TASK_TI_USER_SP, task_struct, thread_info.user_sp);
++<<<<<<< HEAD
 +#ifdef CONFIG_SHADOW_CALL_STACK
 +	OFFSET(TASK_TI_SCS_SP, task_struct, thread_info.scs_sp);
 +#endif
++=======
+ 	OFFSET(TASK_TI_A0, task_struct, thread_info.a0);
+ 	OFFSET(TASK_TI_A1, task_struct, thread_info.a1);
+ 	OFFSET(TASK_TI_A2, task_struct, thread_info.a2);
++>>>>>>> riscv: Stop emitting preventive sfence.vma for new vmalloc mappings
  
 +	OFFSET(TASK_TI_CPU_NUM, task_struct, thread_info.cpu);
  	OFFSET(TASK_THREAD_F0,  task_struct, thread.fstate.f[0]);
  	OFFSET(TASK_THREAD_F1,  task_struct, thread.fstate.f[1]);
  	OFFSET(TASK_THREAD_F2,  task_struct, thread.fstate.f[2]);

[bjoto]

At least one diff in series https://patchwork.kernel.org/project/linux-riscv/list/?series=807901 expired. Closing PR.