diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:41 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:41 -0500 |
| commit | 17eb9d62828c3688f41f31ac00d7fee6da9675bf (patch) | |
| tree | 03da91192242b6467d4f2d9d0b26f11f4da55c0c /kernel/perf_event.c | |
| parent | 76e7461a21dfe13565b2a323b53c8cc963541126 (diff) | |
| parent | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (diff) | |
Merge branches 'sh/g3-prep' and 'sh/stable-updates'
Diffstat (limited to 'kernel/perf_event.c')
| -rw-r--r-- | kernel/perf_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index e0eb4a2fe183..1f38270f08c7 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
| @@ -4724,7 +4724,7 @@ SYSCALL_DEFINE5(perf_event_open, | |||
| 4724 | if (IS_ERR(event)) | 4724 | if (IS_ERR(event)) |
| 4725 | goto err_put_context; | 4725 | goto err_put_context; |
| 4726 | 4726 | ||
| 4727 | err = anon_inode_getfd("[perf_event]", &perf_fops, event, 0); | 4727 | err = anon_inode_getfd("[perf_event]", &perf_fops, event, O_RDWR); |
| 4728 | if (err < 0) | 4728 | if (err < 0) |
| 4729 | goto err_free_put_context; | 4729 | goto err_free_put_context; |
| 4730 | 4730 | ||