diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-12-10 23:23:41 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-12-10 23:23:41 -0500 |
| commit | 1d89c984500718954be30e05850406ac91ba3255 (patch) | |
| tree | ddeaf4a0f7c20beb764d083b2eba97b0f69f9725 | |
| parent | fc2699303be3defb48bfa3259dba66dd2f763fc1 (diff) | |
| parent | 3bbbcb136d00b0718e63f7fd633f098e0889c3d1 (diff) | |
Merge tag 'v3.0.55' into v3.0-rt
This is the 3.0.55 stable release
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/ptrace.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 54 +SUBLEVEL = 55 EXTRAVERSION = NAME = Sneaky Weasel diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index 8ede56797bf2..911e16d8dfa4 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -21,6 +21,7 @@ #include <linux/signal.h> #include <linux/perf_event.h> #include <linux/hw_breakpoint.h> +#include <linux/module.h> #include <asm/uaccess.h> #include <asm/pgtable.h> @@ -191,6 +192,7 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs) return (unsigned long)regs; } +EXPORT_SYMBOL_GPL(kernel_stack_pointer); static unsigned long *pt_regs_access(struct pt_regs *regs, unsigned long regno) { |