aboutsummaryrefslogtreecommitdiff
path: root/arch/parisc/include/asm/unwind.h
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2018-08-22 14:06:37 -0700
committerLinus Torvalds <[email protected]>2018-08-22 14:06:37 -0700
commit45b74a65b9934d5e1520d97aa4e09cf2b8c69ac0 (patch)
tree7c451271a6c274da9b7f37fcb2592d4cfc972644 /arch/parisc/include/asm/unwind.h
parent433bcf67370bc170a345634aa1be4ee8ac905de9 (diff)
parentdbf2a4b1ffab2867505be3b24221d5efa2200c91 (diff)
Merge branch 'parisc-4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull more parisc updates from Helge Deller: - fix boot failure of 64-bit kernel. It got broken by the unwind optimization commit in merge window. - fix 64-bit userspace support (static 64-bit applications only, e.g. we don't yet have 64-bit userspace support in glibc). - consolidate unwind initialization code. - add machine model description to stack trace. * 'parisc-4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: Add hardware description to stack traces parisc: Fix boot failure of 64-bit kernel parisc: Consolidate unwind initialization calls parisc: Update comments in syscall.S regarding wide userland parisc: Fix ptraced 64-bit applications to call 64-bit syscalls parisc: Restore possibility to execute 64-bit applications
Diffstat (limited to 'arch/parisc/include/asm/unwind.h')
-rw-r--r--arch/parisc/include/asm/unwind.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/unwind.h b/arch/parisc/include/asm/unwind.h
index f133b7efbebb..9547e5261a8b 100644
--- a/arch/parisc/include/asm/unwind.h
+++ b/arch/parisc/include/asm/unwind.h
@@ -73,8 +73,10 @@ unwind_table_remove(struct unwind_table *table);
void unwind_frame_init(struct unwind_frame_info *info, struct task_struct *t,
struct pt_regs *regs);
-void unwind_frame_init_from_blocked_task(struct unwind_frame_info *info, struct task_struct *t);
-void unwind_frame_init_running(struct unwind_frame_info *info, struct pt_regs *regs);
+void unwind_frame_init_from_blocked_task(struct unwind_frame_info *info,
+ struct task_struct *t);
+void unwind_frame_init_task(struct unwind_frame_info *info,
+ struct task_struct *task, struct pt_regs *regs);
int unwind_once(struct unwind_frame_info *info);
int unwind_to_user(struct unwind_frame_info *info);