diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2013-04-21 10:25:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2013-04-21 10:25:42 -0700 |
| commit | 312592945487c6e2451d4a41130bfc34d0dba22c (patch) | |
| tree | 78ddc81f1fc1cb83e4efc65b8d5fbfbce7b8f0be /kernel | |
| parent | Merge branch 'vm_ioremap_memory-examples' (diff) | |
| parent | perf/x86: Fix offcore_rsp valid mask for SNB/IVB (diff) | |
| download | linux-312592945487c6e2451d4a41130bfc34d0dba22c.tar.gz linux-312592945487c6e2451d4a41130bfc34d0dba22c.tar.bz2 linux-312592945487c6e2451d4a41130bfc34d0dba22c.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Misc fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86: Fix offcore_rsp valid mask for SNB/IVB
perf: Treat attr.config as u64 in perf_swevent_init()
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 7e0962ed7f8a..4d3124b39277 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5331,7 +5331,7 @@ static void sw_perf_event_destroy(struct perf_event *event) static int perf_swevent_init(struct perf_event *event) { - int event_id = event->attr.config; + u64 event_id = event->attr.config; if (event->attr.type != PERF_TYPE_SOFTWARE) return -ENOENT; |