trivial: Correct print_tainted routine name in comment

[linux-block.git] / kernel / perf_counter.c

diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index d013f4e89e9cdee913b117cbbc83e4e326889113..cc768ab81ac84d3fe81f9742e252f5ffffd348ae 100644 (file)
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -3083,6 +3083,7 @@ struct perf_task_event {
                u32                             ppid;
                u32                             tid;
                u32                             ptid;
+               u64                             time;
        } event;
 };
 
@@ -3090,9 +3091,12 @@ static void perf_counter_task_output(struct perf_counter *counter,
                                     struct perf_task_event *task_event)
 {
        struct perf_output_handle handle;
-       int size = task_event->event.header.size;
+       int size;
        struct task_struct *task = task_event->task;
-       int ret = perf_output_begin(&handle, counter, size, 0, 0);
+       int ret;
+
+       size  = task_event->event.header.size;
+       ret = perf_output_begin(&handle, counter, size, 0, 0);
 
        if (ret)
                return;
@@ -3103,7 +3107,10 @@ static void perf_counter_task_output(struct perf_counter *counter,
        task_event->event.tid = perf_counter_tid(counter, task);
        task_event->event.ptid = perf_counter_tid(counter, current);
 
+       task_event->event.time = perf_clock();
+
        perf_output_put(&handle, task_event->event);
+
        perf_output_end(&handle);
 }
 
@@ -4201,8 +4208,8 @@ done:
 static int perf_copy_attr(struct perf_counter_attr __user *uattr,
                          struct perf_counter_attr *attr)
 {
-       int ret;
        u32 size;
+       int ret;
 
        if (!access_ok(VERIFY_WRITE, uattr, PERF_ATTR_SIZE_VER0))
                return -EFAULT;
@@ -4227,19 +4234,19 @@ static int perf_copy_attr(struct perf_counter_attr __user *uattr,
 
        /*
         * If we're handed a bigger struct than we know of,
-        * ensure all the unknown bits are 0.
+        * ensure all the unknown bits are 0 - i.e. new
+        * user-space does not rely on any kernel feature
+        * extensions we dont know about yet.
         */
        if (size > sizeof(*attr)) {
-               unsigned long val;
-               unsigned long __user *addr;
-               unsigned long __user *end;
+               unsigned char __user *addr;
+               unsigned char __user *end;
+               unsigned char val;
 
-               addr = PTR_ALIGN((void __user *)uattr + sizeof(*attr),
-                               sizeof(unsigned long));
-               end  = PTR_ALIGN((void __user *)uattr + size,
-                               sizeof(unsigned long));
+               addr = (void __user *)uattr + sizeof(*attr);
+               end  = (void __user *)uattr + size;
 
-               for (; addr < end; addr += sizeof(unsigned long)) {
+               for (; addr < end; addr++) {
                        ret = get_user(val, addr);
                        if (ret)
                                return ret;