Merge branch 'linus' into timers/nohz

11 files changed, 169 insertions, 18 deletions

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index eb36f3b746b8..fca9246470b1 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -11,6 +11,8 @@ config SPARC
 config SPARC64
         bool
         default y
+        select HAVE_DYNAMIC_FTRACE
+        select HAVE_FTRACE
         select HAVE_IDE
         select HAVE_LMB
         select HAVE_ARCH_KGDB
diff --git a/arch/sparc64/Kconfig.debug b/arch/sparc64/Kconfig.debug
index 6a4d28a4076d..d6d32d178fc8 100644
--- a/arch/sparc64/Kconfig.debug
+++ b/arch/sparc64/Kconfig.debug
@@ -33,7 +33,7 @@ config DEBUG_PAGEALLOC
 
 config MCOUNT
         bool
-        depends on STACK_DEBUG
+        depends on STACK_DEBUG || FTRACE
         default y
 
 config FRAME_POINTER
diff --git a/arch/sparc64/kernel/Makefile b/arch/sparc64/kernel/Makefile
index ec4f5ebb1ca6..418b5782096e 100644
--- a/arch/sparc64/kernel/Makefile
+++ b/arch/sparc64/kernel/Makefile
@@ -14,6 +14,7 @@ obj-y		:= process.o setup.o cpu.o idprom.o \
                    power.o sbus.o sparc64_ksyms.o chmc.o \
                    visemul.o prom.o of_device.o hvapi.o sstate.o mdesc.o
 
+obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
 obj-$(CONFIG_STACKTRACE) += stacktrace.o
 obj-$(CONFIG_PCI)        += ebus.o pci_common.o \
                             pci_psycho.o pci_sabre.o pci_schizo.o \
diff --git a/arch/sparc64/kernel/ftrace.c b/arch/sparc64/kernel/ftrace.c
new file mode 100644
index 000000000000..4298d0aee713
--- /dev/null
+++ b/arch/sparc64/kernel/ftrace.c
@@ -0,0 +1,94 @@
+#include <linux/spinlock.h>
+#include <linux/hardirq.h>
+#include <linux/ftrace.h>
+#include <linux/percpu.h>
+#include <linux/init.h>
+#include <linux/list.h>
+
+#include <asm/ftrace.h>
+
+static const u32 ftrace_nop = 0x01000000;
+
+notrace unsigned char *ftrace_nop_replace(void)
+{
+        return (char *)&ftrace_nop;
+}
+
+notrace unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
+{
+        static u32 call;
+        s32 off;
+
+        off = ((s32)addr - (s32)ip);
+        call = 0x40000000 | ((u32)off >> 2);
+
+        return (unsigned char *) &call;
+}
+
+notrace int
+ftrace_modify_code(unsigned long ip, unsigned char *old_code,
+                   unsigned char *new_code)
+{
+        u32 old = *(u32 *)old_code;
+        u32 new = *(u32 *)new_code;
+        u32 replaced;
+        int faulted;
+
+        __asm__ __volatile__(
+        "1:     cas     [%[ip]], %[old], %[new]\n"
+        "       flush   %[ip]\n"
+        "       mov     0, %[faulted]\n"
+        "2:\n"
+        "       .section .fixup,#alloc,#execinstr\n"
+        "       .align  4\n"
+        "3:     sethi   %%hi(2b), %[faulted]\n"
+        "       jmpl    %[faulted] + %%lo(2b), %%g0\n"
+        "        mov    1, %[faulted]\n"
+        "       .previous\n"
+        "       .section __ex_table,\"a\"\n"
+        "       .align  4\n"
+        "       .word   1b, 3b\n"
+        "       .previous\n"
+        : "=r" (replaced), [faulted] "=r" (faulted)
+        : [new] "0" (new), [old] "r" (old), [ip] "r" (ip)
+        : "memory");
+
+        if (replaced != old && replaced != new)
+                faulted = 2;
+
+        return faulted;
+}
+
+notrace int ftrace_update_ftrace_func(ftrace_func_t func)
+{
+        unsigned long ip = (unsigned long)(&ftrace_call);
+        unsigned char old[MCOUNT_INSN_SIZE], *new;
+
+        memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
+        new = ftrace_call_replace(ip, (unsigned long)func);
+        return ftrace_modify_code(ip, old, new);
+}
+
+notrace int ftrace_mcount_set(unsigned long *data)
+{
+        unsigned long ip = (long)(&mcount_call);
+        unsigned long *addr = data;
+        unsigned char old[MCOUNT_INSN_SIZE], *new;
+
+        /*
+         * Replace the mcount stub with a pointer to the
+         * ip recorder function.
+         */
+        memcpy(old, &mcount_call, MCOUNT_INSN_SIZE);
+        new = ftrace_call_replace(ip, *addr);
+        *addr = ftrace_modify_code(ip, old, new);
+
+        return 0;
+}
+
+
+int __init ftrace_dyn_arch_init(void *data)
+{
+        ftrace_mcount_set(data);
+        return 0;
+}
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index 112b09f16f36..d00a3656c287 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -408,7 +408,7 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
         dev->class = class >> 8;
         dev->revision = class & 0xff;
 
-        sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),
+        sprintf(dev->dev.bus_id, "%04x:%02x:%02x.%d", pci_domain_nr(bus),
                 dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));
 
         if (ofpci_verbose)
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index fa63c68a1819..c099d96f1239 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -807,7 +807,6 @@ extern unsigned long xcall_call_function;
  * smp_call_function(): Run a function on all other CPUs.
  * @func: The function to run. This must be fast and non-blocking.
  * @info: An arbitrary pointer to pass to the function.
- * @nonatomic: currently unused.
  * @wait: If true, wait (atomically) until function has completed on other CPUs.
  *
  * Returns 0 on success, else a negative status code. Does not return until
@@ -816,8 +815,8 @@ extern unsigned long xcall_call_function;
  * You must not call this function with disabled interrupts or from a
  * hardware interrupt handler or from a bottom half handler.
  */
-static int smp_call_function_mask(void (*func)(void *info), void *info,
-                                  int nonatomic, int wait, cpumask_t mask)
+static int sparc64_smp_call_function_mask(void (*func)(void *info), void *info,
+                                          int wait, cpumask_t mask)
 {
         struct call_data_struct data;
         int cpus;
@@ -852,11 +851,9 @@ out_unlock:
         return 0;
 }
 
-int smp_call_function(void (*func)(void *info), void *info,
-                      int nonatomic, int wait)
+int smp_call_function(void (*func)(void *info), void *info, int wait)
 {
-        return smp_call_function_mask(func, info, nonatomic, wait,
-                                      cpu_online_map);
+        return sparc64_smp_call_function_mask(func, info, wait, cpu_online_map);
 }
 
 void smp_call_function_client(int irq, struct pt_regs *regs)
@@ -893,7 +890,7 @@ static void tsb_sync(void *info)
 
 void smp_tsb_sync(struct mm_struct *mm)
 {
-        smp_call_function_mask(tsb_sync, mm, 0, 1, mm->cpu_vm_mask);
+        sparc64_smp_call_function_mask(tsb_sync, mm, 1, mm->cpu_vm_mask);
 }
 
 extern unsigned long xcall_flush_tlb_mm;
diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c
index 8ac0b99f2c55..49d3ea50c247 100644
--- a/arch/sparc64/kernel/sparc64_ksyms.c
+++ b/arch/sparc64/kernel/sparc64_ksyms.c
@@ -53,6 +53,7 @@
 #include <asm/ns87303.h>
 #include <asm/timer.h>
 #include <asm/cpudata.h>
+#include <asm/ftrace.h>
 
 struct poll {
         int fd;
@@ -111,8 +112,7 @@ EXPORT_SYMBOL(__write_trylock);
 EXPORT_SYMBOL(smp_call_function);
 #endif /* CONFIG_SMP */
 
-#if defined(CONFIG_MCOUNT)
-extern void _mcount(void);
+#ifdef CONFIG_MCOUNT
 EXPORT_SYMBOL(_mcount);
 #endif
 
diff --git a/arch/sparc64/kernel/stacktrace.c b/arch/sparc64/kernel/stacktrace.c
index c73ce3f4197e..b3e3737750d8 100644
--- a/arch/sparc64/kernel/stacktrace.c
+++ b/arch/sparc64/kernel/stacktrace.c
@@ -1,6 +1,7 @@
 #include <linux/sched.h>
 #include <linux/stacktrace.h>
 #include <linux/thread_info.h>
+#include <linux/module.h>
 #include <asm/ptrace.h>
 #include <asm/stacktrace.h>
 
@@ -47,3 +48,4 @@ void save_stack_trace(struct stack_trace *trace)
                         trace->entries[trace->nr_entries++] = pc;
         } while (trace->nr_entries < trace->max_entries);
 }
+EXPORT_SYMBOL_GPL(save_stack_trace);
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index e5d238970c7e..bedc4c159b1c 100644
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -11,6 +11,7 @@
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/sched.h>
+#include <linux/smp_lock.h>
 #include <linux/kernel.h>
 #include <linux/param.h>
 #include <linux/string.h>
@@ -1659,10 +1660,14 @@ static int mini_rtc_ioctl(struct inode *inode, struct file *file,
 
 static int mini_rtc_open(struct inode *inode, struct file *file)
 {
-        if (mini_rtc_status & RTC_IS_OPEN)
+        lock_kernel();
+        if (mini_rtc_status & RTC_IS_OPEN) {
+                unlock_kernel();
                 return -EBUSY;
+        }
 
         mini_rtc_status |= RTC_IS_OPEN;
+        unlock_kernel();
 
         return 0;
 }
diff --git a/arch/sparc64/lib/mcount.S b/arch/sparc64/lib/mcount.S
index 9e4534b485c7..7735a7a60533 100644
--- a/arch/sparc64/lib/mcount.S
+++ b/arch/sparc64/lib/mcount.S
@@ -28,10 +28,13 @@ ovstack:
         .skip           OVSTACKSIZE
 #endif
         .text
-        .align 32
-        .globl mcount, _mcount
-mcount:
+        .align          32
+        .globl          _mcount
+        .type           _mcount,#function
+        .globl          mcount
+        .type           mcount,#function
 _mcount:
+mcount:
 #ifdef CONFIG_STACK_DEBUG
         /*
          * Check whether %sp is dangerously low.
@@ -55,6 +58,53 @@ _mcount:
          or             %g3, %lo(panicstring), %o0
         call            prom_halt
          nop
+1:
+#endif
+#ifdef CONFIG_FTRACE
+#ifdef CONFIG_DYNAMIC_FTRACE
+        mov             %o7, %o0
+        .globl          mcount_call
+mcount_call:
+        call            ftrace_stub
+         mov            %o0, %o7
+#else
+        sethi           %hi(ftrace_trace_function), %g1
+        sethi           %hi(ftrace_stub), %g2
+        ldx             [%g1 + %lo(ftrace_trace_function)], %g1
+        or              %g2, %lo(ftrace_stub), %g2
+        cmp             %g1, %g2
+        be,pn           %icc, 1f
+         mov            %i7, %o1
+        jmpl            %g1, %g0
+         mov            %o7, %o0
+        /* not reached */
+1:
 #endif
-1:      retl
+#endif
+        retl
          nop
+        .size           _mcount,.-_mcount
+        .size           mcount,.-mcount
+
+#ifdef CONFIG_FTRACE
+        .globl          ftrace_stub
+        .type           ftrace_stub,#function
+ftrace_stub:
+        retl
+         nop
+        .size           ftrace_stub,.-ftrace_stub
+#ifdef CONFIG_DYNAMIC_FTRACE
+        .globl          ftrace_caller
+        .type           ftrace_caller,#function
+ftrace_caller:
+        mov             %i7, %o1
+        mov             %o7, %o0
+        .globl          ftrace_call
+ftrace_call:
+        call            ftrace_stub
+         mov            %o0, %o7
+        retl
+         nop
+        .size           ftrace_caller,.-ftrace_caller
+#endif
+#endif
diff --git a/arch/sparc64/mm/hugetlbpage.c b/arch/sparc64/mm/hugetlbpage.c
index 6cfab2e4d340..ebefd2a14375 100644
--- a/arch/sparc64/mm/hugetlbpage.c
+++ b/arch/sparc64/mm/hugetlbpage.c
@@ -344,7 +344,7 @@ void hugetlb_prefault_arch_hook(struct mm_struct *mm)
                          * also executing in this address space.
                          */
                         mm->context.sparc64_ctx_val = ctx;
-                        on_each_cpu(context_reload, mm, 0, 0);
+                        on_each_cpu(context_reload, mm, 0);
                 }
                 spin_unlock(&ctx_alloc_lock);
         }