Commit 81444b77 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'for-next/misc' into for-next/core 

* for-next/misc:
  arm64: kexec: include reboot.h
  arm64: delete dead code in this_cpu_set_vectors()
  arm64: kernel: Fix kernel warning when nokaslr is passed to commandline
  arm64: kgdb: Set PSTATE.SS to 1 to re-enable single-step
  arm64/sme: Fix some comments of ARM SME
  arm64/signal: Alloc tpidr2 sigframe after checking system_supports_tpidr2()
  arm64/signal: Use system_supports_tpidr2() to check TPIDR2
  arm64: compat: Remove defines now in asm-generic
  arm64: kexec: remove unnecessary (void*) conversions
  arm64: armv8_deprecated: remove unnecessary (void*) conversions
  firmware: arm_sdei: Fix sleep from invalid context BUG
parents f8863bc8 b7b4ce84

arch/arm64/include/asm/compat.h

+0 −4
Original line number Diff line number Diff line
@@ -83,10 +83,6 @@ struct compat_statfs { 
	int		f_spare[4];

};



#define COMPAT_RLIM_INFINITY		0xffffffff



#define COMPAT_OFF_T_MAX	0x7fffffff



#define compat_user_stack_pointer() (user_stack_pointer(task_pt_regs(current)))

#define COMPAT_MINSIGSTKSZ	2048

arch/arm64/include/asm/debug-monitors.h

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ void user_regs_reset_single_step(struct user_pt_regs *regs, 
void kernel_enable_single_step(struct pt_regs *regs);

void kernel_disable_single_step(void);

int kernel_active_single_step(void);

void kernel_rewind_single_step(struct pt_regs *regs);



#ifdef CONFIG_HAVE_HW_BREAKPOINT

int reinstall_suspended_bps(struct pt_regs *regs);

arch/arm64/kernel/armv8_deprecated.c

+2 −2
Original line number Diff line number Diff line
@@ -420,14 +420,14 @@ static DEFINE_MUTEX(insn_emulation_mutex); 


static void enable_insn_hw_mode(void *data)

{

	struct insn_emulation *insn = (struct insn_emulation *)data;

	struct insn_emulation *insn = data;

	if (insn->set_hw_mode)

		insn->set_hw_mode(true);

}



static void disable_insn_hw_mode(void *data)

{

	struct insn_emulation *insn = (struct insn_emulation *)data;

	struct insn_emulation *insn = data;

	if (insn->set_hw_mode)

		insn->set_hw_mode(false);

}

arch/arm64/kernel/debug-monitors.c

+5 −0
Original line number Diff line number Diff line
@@ -438,6 +438,11 @@ int kernel_active_single_step(void) 
}

NOKPROBE_SYMBOL(kernel_active_single_step);



void kernel_rewind_single_step(struct pt_regs *regs)

{

	set_regs_spsr_ss(regs);

}



/* ptrace API */

void user_enable_single_step(struct task_struct *task)

{

arch/arm64/kernel/fpsimd.c

+2 −2
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ void task_set_vl_onexec(struct task_struct *task, enum vec_type type, 
/*

 * TIF_SME controls whether a task can use SME without trapping while

 * in userspace, when TIF_SME is set then we must have storage

 * alocated in sve_state and sme_state to store the contents of both ZA

 * allocated in sve_state and sme_state to store the contents of both ZA

 * and the SVE registers for both streaming and non-streaming modes.

 *

 * If both SVCR.ZA and SVCR.SM are disabled then at any point we
@@ -1477,7 +1477,7 @@ void do_sve_acc(unsigned long esr, struct pt_regs *regs) 
 *

 * TIF_SME should be clear on entry: otherwise, fpsimd_restore_current_state()

 * would have disabled the SME access trap for userspace during

 * ret_to_user, making an SVE access trap impossible in that case.

 * ret_to_user, making an SME access trap impossible in that case.

 */

void do_sme_acc(unsigned long esr, struct pt_regs *regs)

{