diff --git a/[refs] b/[refs]
index f37432bbb8ea..4cf4d3e58628 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16acc0cd8f1aac63ddf5228c5bc29cf7d31627f4
+refs/heads/master: 099f318b8d97490e58c595eb1b6d3415da5ccc03
diff --git a/trunk/arch/x86_64/kernel/process.c b/trunk/arch/x86_64/kernel/process.c
index 8ded407e4a94..22a05dec81a2 100644
--- a/trunk/arch/x86_64/kernel/process.c
+++ b/trunk/arch/x86_64/kernel/process.c
@@ -516,8 +516,10 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long rsp,
  * This could still be optimized: 
  * - fold all the options into a flag word and test it with a single test.
  * - could test fs/gs bitsliced
+ *
+ * Kprobes not supported here. Set the probe on schedule instead.
  */
-struct task_struct *
+__kprobes struct task_struct *
 __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
 {
 	struct thread_struct *prev = &prev_p->thread,