3 files changed, 17 insertions, 7 deletions

diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
index 186efaf49665..c42455ab1558 100644
--- a/include/linux/perf_counter.h
+++ b/include/linux/perf_counter.h
@@ -69,9 +69,10 @@ struct perf_counter_hw_event {
         __s64                   type;
 
         __u64                   irq_period;
-        __u32                   record_type;
+        __u64                   record_type;
+        __u64                   read_format;
 
-        __u32                   disabled       :  1, /* off by default        */
+        __u64                   disabled       :  1, /* off by default        */
                                 nmi            :  1, /* NMI sampling          */
                                 raw            :  1, /* raw event type        */
                                 inherit        :  1, /* children inherit it   */
@@ -80,10 +81,15 @@ struct perf_counter_hw_event {
                                 exclude_user   :  1, /* don't count user      */
                                 exclude_kernel :  1, /* ditto kernel          */
                                 exclude_hv     :  1, /* ditto hypervisor      */
+                                exclude_idle   :  1, /* don't count when idle */
 
-                                __reserved_1 : 23;
+                                __reserved_1 : 55;
+
+        __u32                   extra_config_len;
+        __u32                   __reserved_4;
 
         __u64                   __reserved_2;
+        __u64                   __reserved_3;
 };
 
 /*
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 28ef2be839c7..ab1d77247395 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -698,5 +698,5 @@ int kernel_execve(const char *filename, char *const argv[], char *const envp[]);
 
 asmlinkage long sys_perf_counter_open(
                 const struct perf_counter_hw_event __user *hw_event_uptr,
-                pid_t pid, int cpu, int group_fd);
+                pid_t pid, int cpu, int group_fd, unsigned long flags);
 #endif
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,
 }
 
 /**
- * sys_perf_task_open - open a performance counter, associate it to a task/cpu
+ * sys_perf_counter_open - open a performance counter, associate it to a task/cpu
  *
  * @hw_event_uptr:      event type attributes for monitoring/sampling
  * @pid:                target pid
  * @cpu:                target cpu
  * @group_fd:           group leader counter fd
  */
-SYSCALL_DEFINE4(perf_counter_open,
+SYSCALL_DEFINE5(perf_counter_open,
                 const struct perf_counter_hw_event __user *, hw_event_uptr,
-                pid_t, pid, int, cpu, int, group_fd)
+                pid_t, pid, int, cpu, int, group_fd, unsigned long, flags)
 {
         struct perf_counter *counter, *group_leader;
         struct perf_counter_hw_event hw_event;
@@ -1703,6 +1703,10 @@ SYSCALL_DEFINE4(perf_counter_open,
         int fput_needed2 = 0;
         int ret;
 
+        /* for future expandability... */
+        if (flags)
+                return -EINVAL;
+
         if (copy_from_user(&hw_event, hw_event_uptr, sizeof(hw_event)) != 0)
                 return -EFAULT;