diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-23 10:04:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-23 10:04:02 -0700 |
| commit | d5049617a05239873109575922ce7c0adb3e0769 (patch) | |
| tree | 0f8aa568bccdb225a391315c573fb8a081558c1f /arch/sparc/kernel/hvcalls.S | |
| parent | Linux 4.0-rc5 (diff) | |
| parent | sparc64: Fix several bugs in memmove(). (diff) | |
| download | linux-dev-d5049617a05239873109575922ce7c0adb3e0769.tar.xz linux-dev-d5049617a05239873109575922ce7c0adb3e0769.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
"Some perf bug fixes from David Ahern, and the fix for that nasty
memmove() bug"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Fix several bugs in memmove().
sparc: Touch NMI watchdog when walking cpus and calling printk
sparc: perf: Add support M7 processor
sparc: perf: Make counting mode actually work
sparc: perf: Remove redundant perf_pmu_{en|dis}able calls
Diffstat (limited to 'arch/sparc/kernel/hvcalls.S')
| -rw-r--r-- | arch/sparc/kernel/hvcalls.S | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/sparc/kernel/hvcalls.S b/arch/sparc/kernel/hvcalls.S index caedf8320416..afbaba52d2f1 100644 --- a/arch/sparc/kernel/hvcalls.S +++ b/arch/sparc/kernel/hvcalls.S @@ -837,3 +837,19 @@ ENTRY(sun4v_t5_set_perfreg) retl nop ENDPROC(sun4v_t5_set_perfreg) + +ENTRY(sun4v_m7_get_perfreg) + mov %o1, %o4 + mov HV_FAST_M7_GET_PERFREG, %o5 + ta HV_FAST_TRAP + stx %o1, [%o4] + retl + nop +ENDPROC(sun4v_m7_get_perfreg) + +ENTRY(sun4v_m7_set_perfreg) + mov HV_FAST_M7_SET_PERFREG, %o5 + ta HV_FAST_TRAP + retl + nop +ENDPROC(sun4v_m7_set_perfreg) |