diff options
| author | Will Deacon <will@kernel.org> | 2023-04-20 11:22:09 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2023-04-20 11:22:09 +0100 |
| commit | 81444b77a4443e985b567310f19d601368ed4762 (patch) | |
| tree | 2f87700054a6efd809127b53ea782d802e654fbf /arch/arm64/include/asm | |
| parent | f8863bc8c1f9cf4bc3bdc58a98c5a41d0b4c14c5 (diff) | |
| parent | b7b4ce84c830ae3ce6429fbbd70a62a4ae1ac78d (diff) | |
| download | linux-stable-81444b77a4443e985b567310f19d601368ed4762.tar.gz linux-stable-81444b77a4443e985b567310f19d601368ed4762.tar.bz2 linux-stable-81444b77a4443e985b567310f19d601368ed4762.zip | |
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
Diffstat (limited to 'arch/arm64/include/asm')
| -rw-r--r-- | arch/arm64/include/asm/compat.h | 4 | ||||
| -rw-r--r-- | arch/arm64/include/asm/debug-monitors.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index 9f362274a4f7..74575c3d6987 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -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 diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h index 7b7e05c02691..13d437bcbf58 100644 --- a/arch/arm64/include/asm/debug-monitors.h +++ b/arch/arm64/include/asm/debug-monitors.h @@ -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); |