diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-12-10 18:13:22 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-12-10 18:13:22 -0500 |
| commit | 265a65cb7c54ac2464fc179cf2459b44249bb205 (patch) | |
| tree | b024c56a0f92f3fdb18a110294a324e610cbf4db | |
| parent | 5655e05eb551bb54eb08e6a7808af00d82ddb867 (diff) | |
| parent | edc7a368636e2a48da92e059505c905737faf1c8 (diff) | |
Merge tag 'v3.4.22' into v3.4-rt
This is the 3.4.22 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 = 4 -SUBLEVEL = 21 +SUBLEVEL = 22 EXTRAVERSION = NAME = Saber-toothed Squirrel diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index d3e115297fe2..c4410fb4938f 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> @@ -192,6 +193,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) { |