From 176cb95688168050dba1c56761dce2d28b2c6aeb Mon Sep 17 00:00:00 2001
From: Nick Alcock <nick.alcock@oracle.com>
Date: Thu, 18 Oct 2012 16:43:30 +0100
Subject: [PATCH] dtrace: fix outright typos in the 3.6 forward-port.

The mass cherry-pick of 3.6 support introduced some build-breaking typos.  This
fixes them (fixing here rather than where introduced for simplicity's sake and
because we don't really expect past history to be compilable against 3.6 without
changes).

Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
---
 Makefile                          | 10 ++++++----
 arch/x86/include/asm/stacktrace.h |  7 -------
 kernel/sched/core.c               |  4 ++--
 kernel/signal.c                   |  2 +-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index cafabb525ad8..af7123949492 100644
--- a/Makefile
+++ b/Makefile
@@ -1109,11 +1109,13 @@ ifndef CONFIG_DT_DISABLE_CTF
 # This is made doubly annoying by the presence of '.o' files which are actually
 # empty ar archives.
 objects.builtin: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) FORCE
-	@echo $(vmlinux-all) | tr " " "\n" | grep "\.o$$" | xargs file | \
+	@echo $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN) | \
+		tr " " "\n" | grep "\.o$$" | xargs file | \
 		grep ELF | cut -d: -f1 > objects.builtin
-	@for archive in $$(echo $(vmlinux-all) | tr " " "\n" | grep "\.a$$"); do \
-	    ar t "$$archive" | grep '\.o$$' | \
-		 sed "s,^,$${archive%/*}/," >> objects.builtin; \
+	@for archive in $$(echo $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN) |\
+		tr " " "\n" | grep "\.a$$"); do \
+		ar t "$$archive" | grep '\.o$$' | \
+			sed "s,^,$${archive%/*}/," >> objects.builtin; \
 	done
 else
 PHONY += objects.builtin
diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
index c57a075b9ef1..70bbe39043a9 100644
--- a/arch/x86/include/asm/stacktrace.h
+++ b/arch/x86/include/asm/stacktrace.h
@@ -43,13 +43,6 @@ struct stacktrace_ops {
 	walk_stack_t	walk_stack;
 };
 
-extern unsigned long print_context_stack(struct thread_info *tinfo,
-					 unsigned long *stack,
-					 unsigned long bp,
-					 const struct stacktrace_ops *ops,
-					 void *data, unsigned long *end,
-					 int *graph);
-
 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
 		unsigned long *stack, unsigned long bp,
 		const struct stacktrace_ops *ops, void *data);
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 50b513f89f4c..0aee1562221c 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2781,7 +2781,7 @@ static void __sched __schedule(void)
 			} else {
 				deactivate_task(rq, prev, DEQUEUE_SLEEP);
 				prev->on_rq = 0;
-	
+
 				/*
 				 * If a worker went to sleep, notify and ask
 				 * workqueue whether it wants to wake up a task
@@ -2789,7 +2789,7 @@ static void __sched __schedule(void)
 				 */
 				if (prev->flags & PF_WQ_WORKER) {
 					struct task_struct *to_wakeup;
-	
+
 					to_wakeup = wq_worker_sleeping(prev, cpu);
 					if (to_wakeup)
 						try_to_wake_up_local(to_wakeup);
diff --git a/kernel/signal.c b/kernel/signal.c
index fa109bb027cd..35a031d82087 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1123,8 +1123,8 @@ out_set:
 	signalfd_notify(t, sig);
 	sigaddset(&pending->signal, sig);
 	complete_signal(sig, t, group);
-ret:
 	DTRACE_PROC2(signal__send, struct task_struct *, t, int, sig);
+ret:
 	trace_signal_generate(sig, info, t, group, result);
 	return ret;
 }
-- 
2.50.1