diff options
Diffstat (limited to 'kernel/perf_counter.c')
-rw-r--r-- | kernel/perf_counter.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c index 16b14ba99d34..b2e838959f3e 100644 --- a/kernel/perf_counter.c +++ b/kernel/perf_counter.c | |||
@@ -1683,16 +1683,16 @@ perf_counter_alloc(struct perf_counter_hw_event *hw_event, | |||
1683 | } | 1683 | } |
1684 | 1684 | ||
1685 | /** | 1685 | /** |
1686 | * sys_perf_task_open - open a performance counter, associate it to a task/cpu | 1686 | * sys_perf_counter_open - open a performance counter, associate it to a task/cpu |
1687 | * | 1687 | * |
1688 | * @hw_event_uptr: event type attributes for monitoring/sampling | 1688 | * @hw_event_uptr: event type attributes for monitoring/sampling |
1689 | * @pid: target pid | 1689 | * @pid: target pid |
1690 | * @cpu: target cpu | 1690 | * @cpu: target cpu |
1691 | * @group_fd: group leader counter fd | 1691 | * @group_fd: group leader counter fd |
1692 | */ | 1692 | */ |
1693 | SYSCALL_DEFINE4(perf_counter_open, | 1693 | SYSCALL_DEFINE5(perf_counter_open, |
1694 | const struct perf_counter_hw_event __user *, hw_event_uptr, | 1694 | const struct perf_counter_hw_event __user *, hw_event_uptr, |
1695 | pid_t, pid, int, cpu, int, group_fd) | 1695 | pid_t, pid, int, cpu, int, group_fd, unsigned long, flags) |
1696 | { | 1696 | { |
1697 | struct perf_counter *counter, *group_leader; | 1697 | struct perf_counter *counter, *group_leader; |
1698 | struct perf_counter_hw_event hw_event; | 1698 | struct perf_counter_hw_event hw_event; |
@@ -1703,6 +1703,10 @@ SYSCALL_DEFINE4(perf_counter_open, | |||
1703 | int fput_needed2 = 0; | 1703 | int fput_needed2 = 0; |
1704 | int ret; | 1704 | int ret; |
1705 | 1705 | ||
1706 | /* for future expandability... */ | ||
1707 | if (flags) | ||
1708 | return -EINVAL; | ||
1709 | |||
1706 | if (copy_from_user(&hw_event, hw_event_uptr, sizeof(hw_event)) != 0) | 1710 | if (copy_from_user(&hw_event, hw_event_uptr, sizeof(hw_event)) != 0) |
1707 | return -EFAULT; | 1711 | return -EFAULT; |
1708 | 1712 | ||