diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-19 11:42:32 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-19 11:42:32 -0800 |
commit | cdc7ef8981317cfa9a462b784935e4d2705c6776 (patch) | |
tree | b81a0424a333e72a6223b5764ccde0c8ea36549b /arch/x86/um/sysrq_64.c | |
parent | 9066d9b250679f259f06c10f489dfdfa75fb54dd (diff) | |
parent | 33a7d42999b1857d4494f6ad6367e3aef0ae8137 (diff) | |
download | linux-cdc7ef8981317cfa9a462b784935e4d2705c6776.tar.bz2 |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML changes from Richard Weinberger:
"This pile contains a nice defconfig cleanup, a rewritten stack
unwinder and various cleanups"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Remove unused declarations from <as-layout.h>
um: remove used STDIO_CONSOLE Kconfig param
um/vdso: add .gitignore for a couple of targets
arch/um: make it work with defconfig and x86_64
um: Make kstack_depth_to_print conform to arch/x86
um: Get rid of thread_struct->saved_task
um: Make stack trace reliable against kernel mode faults
um: Rewrite show_stack()
Diffstat (limited to 'arch/x86/um/sysrq_64.c')
-rw-r--r-- | arch/x86/um/sysrq_64.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/x86/um/sysrq_64.c b/arch/x86/um/sysrq_64.c index a0e7fb1134a0..38b4e4abd0f8 100644 --- a/arch/x86/um/sysrq_64.c +++ b/arch/x86/um/sysrq_64.c @@ -12,7 +12,7 @@ #include <asm/ptrace.h> #include <asm/sysrq.h> -void __show_regs(struct pt_regs *regs) +void show_regs(struct pt_regs *regs) { printk("\n"); print_modules(); @@ -33,9 +33,3 @@ void __show_regs(struct pt_regs *regs) printk(KERN_INFO "R13: %016lx R14: %016lx R15: %016lx\n", PT_REGS_R13(regs), PT_REGS_R14(regs), PT_REGS_R15(regs)); } - -void show_regs(struct pt_regs *regs) -{ - __show_regs(regs); - show_trace(current, (unsigned long *) ®s); -} |