From f899ce7c578f3cfd5dabda17c10b471576a70106 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Sun, 13 Jan 2013 19:03:34 +0100
Subject: [PATCH] --- yaml --- r: 350097 b: refs/heads/master c:
 e8440c1458ba571bc3fac8a6beb53ff604199f5b h: refs/heads/master i:   350095:
 c9ec5bf127874b0e8c633488caebeb85593d4fac v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/events/uprobes.c | 3 +++
 trunk/kernel/ptrace.c         | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6a4c5efe3089..4bf63c2788d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af4355e91f15812df8608925738c91be57c580dd
+refs/heads/master: e8440c1458ba571bc3fac8a6beb53ff604199f5b
diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c
index f6c7062fb950..221fc58f59e3 100644
--- a/trunk/kernel/events/uprobes.c
+++ b/trunk/kernel/events/uprobes.c
@@ -27,6 +27,7 @@
 #include <linux/pagemap.h>	/* read_mapping_page */
 #include <linux/slab.h>
 #include <linux/sched.h>
+#include <linux/export.h>
 #include <linux/rmap.h>		/* anon_vma_prepare */
 #include <linux/mmu_notifier.h>	/* set_pte_at_notify */
 #include <linux/swap.h>		/* try_to_free_swap */
@@ -851,6 +852,7 @@ int uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *
 		goto retry;
 	return ret;
 }
+EXPORT_SYMBOL_GPL(uprobe_register);
 
 /*
  * uprobe_unregister - unregister a already registered probe.
@@ -871,6 +873,7 @@ void uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consume
 	up_write(&uprobe->register_rwsem);
 	put_uprobe(uprobe);
 }
+EXPORT_SYMBOL_GPL(uprobe_unregister);
 
 static int unapply_uprobe(struct uprobe *uprobe, struct mm_struct *mm)
 {
diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c
index 6cbeaae4406d..acbd28424d81 100644
--- a/trunk/kernel/ptrace.c
+++ b/trunk/kernel/ptrace.c
@@ -712,6 +712,12 @@ static int ptrace_regset(struct task_struct *task, int req, unsigned int type,
 					     kiov->iov_len, kiov->iov_base);
 }
 
+/*
+ * This is declared in linux/regset.h and defined in machine-dependent
+ * code.  We put the export here, near the primary machine-neutral use,
+ * to ensure no machine forgets it.
+ */
+EXPORT_SYMBOL_GPL(task_user_regset_view);
 #endif
 
 int ptrace_request(struct task_struct *child, long request,