diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-10 17:11:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-10 17:11:17 +0200 |
| commit | 08fb98f5bf95cef902fc30427b39617a6f6875c7 (patch) | |
| tree | d709cdc500b447bb957fd1e7fbc9073005b8ce8e /arch/mn10300/kernel/kgdb.c | |
| parent | x86/fpu/xstate: Copy xstate registers directly to the signal frame when compa... (diff) | |
| parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| download | linux-08fb98f5bf95cef902fc30427b39617a6f6875c7.tar.xz linux-08fb98f5bf95cef902fc30427b39617a6f6875c7.zip | |
Merge branch 'linus' into x86/fpu, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mn10300/kernel/kgdb.c')
| -rw-r--r-- | arch/mn10300/kernel/kgdb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/kgdb.c b/arch/mn10300/kernel/kgdb.c index 99770823451a..2d7986c386fe 100644 --- a/arch/mn10300/kernel/kgdb.c +++ b/arch/mn10300/kernel/kgdb.c @@ -397,8 +397,9 @@ static bool kgdb_arch_undo_singlestep(struct pt_regs *regs) * single-step state is cleared. At this point the breakpoints should have * been removed by __switch_to(). */ -void arch_release_thread_info(struct thread_info *ti) +void arch_release_thread_stack(unsigned long *stack) { + struct thread_info *ti = (void *)stack; if (kgdb_sstep_thread == ti) { kgdb_sstep_thread = NULL; |