diff options
| author |   Catalin Marinas <catalin.marinas@arm.com> | 2016-07-27 08:11:10 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2016-07-27 08:15:42 +0100 |
| commit | fd6380b75065fd2ff51b5f7cbbe6be77d71ea9c7 (patch) | |
| tree | 07dd3ad8a5a54e77a7c2d87fd7f58955fc36c1ca /arch | |
| parent | arm64: Only select ARM64_MODULE_PLTS if MODULES=y (diff) | |
| download | linux-dev-fd6380b75065fd2ff51b5f7cbbe6be77d71ea9c7.tar.xz linux-dev-fd6380b75065fd2ff51b5f7cbbe6be77d71ea9c7.zip | |
arm64: arm: Fix-up the removal of the arm64 regs_query_register_name() prototype
Commit 0a8ea52c3eb1 ("arm64: Add HAVE_REGS_AND_STACK_ACCESS_API
feature") inadvertently removed the arch/arm prototype instead of the
arm64 one introduced by the original patch. There should not be any
bisection issues since this function is not called from anywhere else
(it could as well be removed from arch/arm at some point).
Fixes: 0a8ea52c3eb1 ("arm64: Add HAVE_REGS_AND_STACK_ACCESS_API feature")
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/ptrace.h | 1 | ||||
| -rw-r--r-- | arch/arm64/include/asm/ptrace.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h index d3c0c23703b6..51622ba7c4a6 100644 --- a/arch/arm/include/asm/ptrace.h +++ b/arch/arm/include/asm/ptrace.h @@ -121,6 +121,7 @@ extern unsigned long profile_pc(struct pt_regs *regs); #define MAX_REG_OFFSET (offsetof(struct pt_regs, ARM_ORIG_r0)) extern int regs_query_register_offset(const char *name); +extern const char *regs_query_register_name(unsigned int offset); extern bool regs_within_kernel_stack(struct pt_regs *regs, unsigned long addr); extern unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n); diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h index 3fd15fdf4181..8fbac706b906 100644 --- a/arch/arm64/include/asm/ptrace.h +++ b/arch/arm64/include/asm/ptrace.h @@ -153,7 +153,6 @@ struct pt_regs { (!compat_user_mode(regs) ? ((regs)->sp = value) : ((regs)->compat_sp = value)) extern int regs_query_register_offset(const char *name); -extern const char *regs_query_register_name(unsigned int offset); extern unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n); |