diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-23 17:04:02 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-23 17:04:02 (GMT) |
| commit | d5049617a05239873109575922ce7c0adb3e0769 (patch) | |
| tree | 0f8aa568bccdb225a391315c573fb8a081558c1f /arch/sparc/kernel/hvapi.c | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
| parent | 2077cef4d5c29cf886192ec32066f783d6a80db8 (diff) | |
| download | linux-d5049617a05239873109575922ce7c0adb3e0769.tar.xz | |
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/hvapi.c')
| -rw-r--r-- | arch/sparc/kernel/hvapi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/kernel/hvapi.c b/arch/sparc/kernel/hvapi.c index 5c55145..662500f 100644 --- a/arch/sparc/kernel/hvapi.c +++ b/arch/sparc/kernel/hvapi.c @@ -48,6 +48,7 @@ static struct api_info api_table[] = { { .group = HV_GRP_VT_CPU, }, { .group = HV_GRP_T5_CPU, }, { .group = HV_GRP_DIAG, .flags = FLAG_PRE_API }, + { .group = HV_GRP_M7_PERF, }, }; static DEFINE_SPINLOCK(hvapi_lock); |