diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 09:00:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 09:00:19 -0800 |
| commit | 17c330f98383629cfd359ee62b3adde1d2a3ff7c (patch) | |
| tree | 876bed8fc7de7d404fae579035a948c46a7f05d4 /arch/sparc/math-emu/math_64.c | |
| parent | 48e902f0a3aea4b6b3a73e9d277b92024a493e6d (diff) | |
| parent | 7466bd3caab6bd1d0095de957affbacd02ca58a7 (diff) | |
| download | linux-3.10-17c330f98383629cfd359ee62b3adde1d2a3ff7c.tar.gz linux-3.10-17c330f98383629cfd359ee62b3adde1d2a3ff7c.tar.bz2 linux-3.10-17c330f98383629cfd359ee62b3adde1d2a3ff7c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix clock event multiplier printf format.
sparc64: Use clock{source,events}_calc_mult_shift().
sparc64: Use free_bootmem_late() in mdesc_lmb_free().
sparc: Add alignment and emulation fault perf events.
sparc64: Add syscall tracepoint support.
sparc: Stop trying to be so fancy and use __builtin_{memcpy,memset}()
sparc: Use __builtin_object_size() to validate the buffer size for copy_from_user()
sparc64: Add some missing __kprobes annotations to kernel fault paths.
sparc64: Use kprobes_built_in() to avoid ifdefs in fault_64.c
sparc: Validate that kprobe address is 4-byte aligned.
sparc64: Don't specify IRQF_SHARED for LDC interrupts.
sparc64: Fix stack debugging IRQ stack regression.
sparc64: Fix overly strict range type matching for PCI devices.
Diffstat (limited to 'arch/sparc/math-emu/math_64.c')
| -rw-r--r-- | arch/sparc/math-emu/math_64.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/math-emu/math_64.c b/arch/sparc/math-emu/math_64.c index 6863c9bde25..56d2c44747b 100644 --- a/arch/sparc/math-emu/math_64.c +++ b/arch/sparc/math-emu/math_64.c @@ -11,6 +11,7 @@ #include <linux/types.h> #include <linux/sched.h> #include <linux/errno.h> +#include <linux/perf_event.h> #include <asm/fpumacro.h> #include <asm/ptrace.h> @@ -183,6 +184,7 @@ int do_mathemu(struct pt_regs *regs, struct fpustate *f) if (tstate & TSTATE_PRIV) die_if_kernel("unfinished/unimplemented FPop from kernel", regs); + perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, 0, regs, 0); if (test_thread_flag(TIF_32BIT)) pc = (u32)pc; if (get_user(insn, (u32 __user *) pc) != -EFAULT) { |