From b0859f1f1814749e7028547e8115e07b1aaeae20 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 29 Jul 2008 12:00:59 +0200
Subject: [PATCH] --- yaml --- r: 116572 b: refs/heads/master c:
 36dcd67ae994fece615b7c700958d215e884b9ae h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/kprobes.h | 5 +++--
 trunk/kernel/notifier.c       | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 476c5f81aa98..b4b6540c2c8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9795302acf2817d0842e56d23df6008e43df0970
+refs/heads/master: 36dcd67ae994fece615b7c700958d215e884b9ae
diff --git a/trunk/include/linux/kprobes.h b/trunk/include/linux/kprobes.h
index 0be7795655fa..497b1d1f7a05 100644
--- a/trunk/include/linux/kprobes.h
+++ b/trunk/include/linux/kprobes.h
@@ -29,6 +29,7 @@
  *		<jkenisto@us.ibm.com>  and Prasanna S Panchamukhi
  *		<prasanna@in.ibm.com> added function-return probes.
  */
+#include <linux/linkage.h>
 #include <linux/list.h>
 #include <linux/notifier.h>
 #include <linux/smp.h>
@@ -47,7 +48,7 @@
 #define KPROBE_HIT_SSDONE	0x00000008
 
 /* Attach to insert probes on any functions which should be ignored*/
-#define __kprobes	__attribute__((__section__(".kprobes.text")))
+#define __kprobes	__attribute__((__section__(".kprobes.text"))) notrace
 
 struct kprobe;
 struct pt_regs;
@@ -256,7 +257,7 @@ void recycle_rp_inst(struct kretprobe_instance *ri, struct hlist_head *head);
 
 #else /* CONFIG_KPROBES */
 
-#define __kprobes	/**/
+#define __kprobes	notrace
 struct jprobe;
 struct kretprobe;
 
diff --git a/trunk/kernel/notifier.c b/trunk/kernel/notifier.c
index 823be11584ef..4282c0a40a57 100644
--- a/trunk/kernel/notifier.c
+++ b/trunk/kernel/notifier.c
@@ -550,7 +550,7 @@ EXPORT_SYMBOL(unregister_reboot_notifier);
 
 static ATOMIC_NOTIFIER_HEAD(die_chain);
 
-int notify_die(enum die_val val, const char *str,
+int notrace notify_die(enum die_val val, const char *str,
 	       struct pt_regs *regs, long err, int trap, int sig)
 {
 	struct die_args args = {