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>

diff --git a/Makefile b/Makefile
index cafabb525ad898a4f75929bcbb815ae549d4845e..af71239494924d40827590ab54a4e5fa3a77e108 100644 (file)
--- 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 c57a075b9ef145ae7ca957c8b2554b04fc551fde..70bbe39043a9cda384e9afcd0a2f633cfde20931 100644 (file)
--- 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 50b513f89f4cffbcffc4cec65f8052fb27096941..0aee1562221cd589bf5e3f8a5d028bfd6d64640e 100644 (file)
--- 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 fa109bb027cdc5b3cb88cb8c847ada5a63fbebef..35a031d82087da8668902f978125e1c7aeb0126e 100644 (file)
--- 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;
 }