Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile: (21 commits)
  OProfile: Fix buffer synchronization for IBS
  oprofile: hotplug cpu fix
  oprofile: fixing whitespaces in arch/x86/oprofile/*
  oprofile: fixing whitespaces in arch/x86/oprofile/*
  oprofile: fixing whitespaces in drivers/oprofile/*
  x86/oprofile: add the logic for enabling additional IBS bits
  x86/oprofile: reordering functions in nmi_int.c
  x86/oprofile: removing unused function parameter in add_ibs_begin()
  oprofile: more whitespace fixes
  oprofile: whitespace fixes
  OProfile: Rename IBS sysfs dir into "ibs_op"
  OProfile: Rework string handling in setup_ibs_files()
  OProfile: Rework oprofile_add_ibs_sample() function
  oprofile: discover counters for op ppro too
  oprofile: Implement Intel architectural perfmon support
  oprofile: Don't report Nehalem as core_2
  oprofile: drop const in num counters field
  Revert "Oprofile Multiplexing Patch"
  x86, oprofile: BUG: using smp_processor_id() in preemptible code
  x86/oprofile: fix on_each_cpu build error
  ...

Manually fixed trivial conflicts in
	drivers/oprofile/{cpu_buffer.c,event_buffer.h}

13 files changed, 174 insertions, 184 deletions

diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index 37681700b61a..b55cd23ffdef 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -41,7 +41,6 @@ static cpumask_t marked_cpus = CPU_MASK_NONE;
 static DEFINE_SPINLOCK(task_mortuary);
 static void process_task_mortuary(void);
 
-
 /* Take ownership of the task struct and place it on the
  * list for processing. Only after two full buffer syncs
  * does the task eventually get freed, because by then
@@ -341,7 +340,7 @@ static void add_trace_begin(void)
  * Add IBS fetch and op entries to event buffer
  */
 static void add_ibs_begin(struct oprofile_cpu_buffer *cpu_buf, int code,
-        int in_kernel, struct mm_struct *mm)
+                          struct mm_struct *mm)
 {
         unsigned long rip;
         int i, count;
@@ -565,9 +564,11 @@ void sync_buffer(int cpu)
         struct task_struct *new;
         unsigned long cookie = 0;
         int in_kernel = 1;
-        unsigned int i;
         sync_buffer_state state = sb_buffer_start;
+#ifndef CONFIG_OPROFILE_IBS
+        unsigned int i;
         unsigned long available;
+#endif
 
         mutex_lock(&buffer_mutex);
 
@@ -575,9 +576,13 @@ void sync_buffer(int cpu)
 
         /* Remember, only we can modify tail_pos */
 
+#ifndef CONFIG_OPROFILE_IBS
         available = get_slots(cpu_buf);
 
         for (i = 0; i < available; ++i) {
+#else
+        while (get_slots(cpu_buf)) {
+#endif
                 struct op_sample *s = &cpu_buf->buffer[cpu_buf->tail_pos];
 
                 if (is_code(s->eip)) {
@@ -593,12 +598,10 @@ void sync_buffer(int cpu)
 #ifdef CONFIG_OPROFILE_IBS
                         } else if (s->event == IBS_FETCH_BEGIN) {
                                 state = sb_bt_start;
-                                add_ibs_begin(cpu_buf,
-                                        IBS_FETCH_CODE, in_kernel, mm);
+                                add_ibs_begin(cpu_buf, IBS_FETCH_CODE, mm);
                         } else if (s->event == IBS_OP_BEGIN) {
                                 state = sb_bt_start;
-                                add_ibs_begin(cpu_buf,
-                                        IBS_OP_CODE, in_kernel, mm);
+                                add_ibs_begin(cpu_buf, IBS_OP_CODE, mm);
 #endif
                         } else {
                                 struct mm_struct *oldmm = mm;
diff --git a/drivers/oprofile/buffer_sync.h b/drivers/oprofile/buffer_sync.h
index 08866f6a96a3..3110732c1835 100644
--- a/drivers/oprofile/buffer_sync.h
+++ b/drivers/oprofile/buffer_sync.h
@@ -9,13 +9,13 @@
 
 #ifndef OPROFILE_BUFFER_SYNC_H
 #define OPROFILE_BUFFER_SYNC_H
- 
+
 /* add the necessary profiling hooks */
 int sync_start(void);
 
 /* remove the hooks */
 void sync_stop(void);
- 
+
 /* sync the given CPU's buffer */
 void sync_buffer(int cpu);
 
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index 7ba39fe20a8a..01d38e78cde1 100644
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -22,7 +22,7 @@
 #include <linux/oprofile.h>
 #include <linux/vmalloc.h>
 #include <linux/errno.h>
- 
+
 #include "event_buffer.h"
 #include "cpu_buffer.h"
 #include "buffer_sync.h"
@@ -39,7 +39,7 @@ void free_cpu_buffers(void)
 {
         int i;
 
-        for_each_online_cpu(i) {
+        for_each_possible_cpu(i) {
                 vfree(per_cpu(cpu_buffer, i).buffer);
                 per_cpu(cpu_buffer, i).buffer = NULL;
         }
@@ -61,17 +61,17 @@ void oprofile_cpu_buffer_inc_smpl_lost(void)
 int alloc_cpu_buffers(void)
 {
         int i;
- 
+
         unsigned long buffer_size = fs_cpu_buffer_size;
- 
-        for_each_online_cpu(i) {
+
+        for_each_possible_cpu(i) {
                 struct oprofile_cpu_buffer *b = &per_cpu(cpu_buffer, i);
- 
+
                 b->buffer = vmalloc_node(sizeof(struct op_sample) * buffer_size,
                         cpu_to_node(i));
                 if (!b->buffer)
                         goto fail;
- 
+
                 b->last_task = NULL;
                 b->last_is_kernel = -1;
                 b->tracing = 0;
@@ -125,7 +125,7 @@ void end_cpu_work(void)
 }
 
 /* Resets the cpu buffer to a sane state. */
-void cpu_buffer_reset(struct oprofile_cpu_buffer * cpu_buf)
+void cpu_buffer_reset(struct oprofile_cpu_buffer *cpu_buf)
 {
         /* reset these to invalid values; the next sample
          * collected will populate the buffer with proper
@@ -136,7 +136,7 @@ void cpu_buffer_reset(struct oprofile_cpu_buffer * cpu_buf)
 }
 
 /* compute number of available slots in cpu_buffer queue */
-static unsigned long nr_available_slots(struct oprofile_cpu_buffer const * b)
+static unsigned long nr_available_slots(struct oprofile_cpu_buffer const *b)
 {
         unsigned long head = b->head_pos;
         unsigned long tail = b->tail_pos;
@@ -147,7 +147,7 @@ static unsigned long nr_available_slots(struct oprofile_cpu_buffer const * b)
         return tail + (b->buffer_size - head) - 1;
 }
 
-static void increment_head(struct oprofile_cpu_buffer * b)
+static void increment_head(struct oprofile_cpu_buffer *b)
 {
         unsigned long new_head = b->head_pos + 1;
 
@@ -162,17 +162,17 @@ static void increment_head(struct oprofile_cpu_buffer * b)
 }
 
 static inline void
-add_sample(struct oprofile_cpu_buffer * cpu_buf,
-           unsigned long pc, unsigned long event)
+add_sample(struct oprofile_cpu_buffer *cpu_buf,
+           unsigned long pc, unsigned long event)
 {
-        struct op_sample * entry = &cpu_buf->buffer[cpu_buf->head_pos];
+        struct op_sample *entry = &cpu_buf->buffer[cpu_buf->head_pos];
         entry->eip = pc;
         entry->event = event;
         increment_head(cpu_buf);
 }
 
 static inline void
-add_code(struct oprofile_cpu_buffer * buffer, unsigned long value)
+add_code(struct oprofile_cpu_buffer *buffer, unsigned long value)
 {
         add_sample(buffer, ESCAPE_CODE, value);
 }
@@ -186,10 +186,10 @@ add_code(struct oprofile_cpu_buffer * buffer, unsigned long value)
  * pc. We tag this in the buffer by generating kernel enter/exit
  * events whenever is_kernel changes
  */
-static int log_sample(struct oprofile_cpu_buffer * cpu_buf, unsigned long pc,
+static int log_sample(struct oprofile_cpu_buffer *cpu_buf, unsigned long pc,
                       int is_kernel, unsigned long event)
 {
-        struct task_struct * task;
+        struct task_struct *task;
 
         cpu_buf->sample_received++;
 
@@ -218,7 +218,7 @@ static int log_sample(struct oprofile_cpu_buffer * cpu_buf, unsigned long pc,
                 cpu_buf->last_task = task;
                 add_code(cpu_buf, (unsigned long)task);
         }
- 
+
         add_sample(cpu_buf, pc, event);
         return 1;
 }
@@ -235,7 +235,7 @@ static int oprofile_begin_trace(struct oprofile_cpu_buffer *cpu_buf)
         return 1;
 }
 
-static void oprofile_end_trace(struct oprofile_cpu_buffer * cpu_buf)
+static void oprofile_end_trace(struct oprofile_cpu_buffer *cpu_buf)
 {
         cpu_buf->tracing = 0;
 }
@@ -270,21 +270,23 @@ void oprofile_add_sample(struct pt_regs * const regs, unsigned long event)
 
 #ifdef CONFIG_OPROFILE_IBS
 
-#define MAX_IBS_SAMPLE_SIZE     14
-static int log_ibs_sample(struct oprofile_cpu_buffer *cpu_buf,
-        unsigned long pc, int is_kernel, unsigned  int *ibs, int ibs_code)
+#define MAX_IBS_SAMPLE_SIZE 14
+
+void oprofile_add_ibs_sample(struct pt_regs *const regs,
+                             unsigned int *const ibs_sample, int ibs_code)
 {
+        int is_kernel = !user_mode(regs);
+        struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var(cpu_buffer);
         struct task_struct *task;
 
         cpu_buf->sample_received++;
 
         if (nr_available_slots(cpu_buf) < MAX_IBS_SAMPLE_SIZE) {
+                /* we can't backtrace since we lost the source of this event */
                 cpu_buf->sample_lost_overflow++;
-                return 0;
+                return;
         }
 
-        is_kernel = !!is_kernel;
-
         /* notice a switch from user->kernel or vice versa */
         if (cpu_buf->last_is_kernel != is_kernel) {
                 cpu_buf->last_is_kernel = is_kernel;
@@ -294,7 +296,6 @@ static int log_ibs_sample(struct oprofile_cpu_buffer *cpu_buf,
         /* notice a task switch */
         if (!is_kernel) {
                 task = current;
-
                 if (cpu_buf->last_task != task) {
                         cpu_buf->last_task = task;
                         add_code(cpu_buf, (unsigned long)task);
@@ -302,36 +303,17 @@ static int log_ibs_sample(struct oprofile_cpu_buffer *cpu_buf,
         }
 
         add_code(cpu_buf, ibs_code);
-        add_sample(cpu_buf, ibs[0], ibs[1]);
-        add_sample(cpu_buf, ibs[2], ibs[3]);
-        add_sample(cpu_buf, ibs[4], ibs[5]);
+        add_sample(cpu_buf, ibs_sample[0], ibs_sample[1]);
+        add_sample(cpu_buf, ibs_sample[2], ibs_sample[3]);
+        add_sample(cpu_buf, ibs_sample[4], ibs_sample[5]);
 
         if (ibs_code == IBS_OP_BEGIN) {
-        add_sample(cpu_buf, ibs[6], ibs[7]);
-        add_sample(cpu_buf, ibs[8], ibs[9]);
-        add_sample(cpu_buf, ibs[10], ibs[11]);
-        }
-
-        return 1;
-}
-
-void oprofile_add_ibs_sample(struct pt_regs *const regs,
-                                unsigned int * const ibs_sample, u8 code)
-{
-        int is_kernel = !user_mode(regs);
-        unsigned long pc = profile_pc(regs);
-
-        struct oprofile_cpu_buffer *cpu_buf =
-                         &per_cpu(cpu_buffer, smp_processor_id());
-
-        if (!backtrace_depth) {
-                log_ibs_sample(cpu_buf, pc, is_kernel, ibs_sample, code);
-                return;
+                add_sample(cpu_buf, ibs_sample[6], ibs_sample[7]);
+                add_sample(cpu_buf, ibs_sample[8], ibs_sample[9]);
+                add_sample(cpu_buf, ibs_sample[10], ibs_sample[11]);
         }
 
-        /* if log_sample() fails we can't backtrace since we lost the source
-        * of this event */
-        if (log_ibs_sample(cpu_buf, pc, is_kernel, ibs_sample, code))
+        if (backtrace_depth)
                 oprofile_ops.backtrace(regs, backtrace_depth);
 }
 
@@ -376,11 +358,16 @@ void oprofile_add_trace(unsigned long pc)
  */
 static void wq_sync_buffer(struct work_struct *work)
 {
-        struct oprofile_cpu_buffer * b =
+        struct oprofile_cpu_buffer *b =
                 container_of(work, struct oprofile_cpu_buffer, work.work);
         if (b->cpu != smp_processor_id()) {
                 printk(KERN_DEBUG "WQ on CPU%d, prefer CPU%d\n",
                        smp_processor_id(), b->cpu);
+
+                if (!cpu_online(b->cpu)) {
+                        cancel_delayed_work(&b->work);
+                        return;
+                }
         }
         sync_buffer(b->cpu);
 
diff --git a/drivers/oprofile/cpu_buffer.h b/drivers/oprofile/cpu_buffer.h
index 9c44d004da69..d3cc26264db5 100644
--- a/drivers/oprofile/cpu_buffer.h
+++ b/drivers/oprofile/cpu_buffer.h
@@ -15,9 +15,9 @@
 #include <linux/workqueue.h>
 #include <linux/cache.h>
 #include <linux/sched.h>
- 
+
 struct task_struct;
- 
+
 int alloc_cpu_buffers(void);
 void free_cpu_buffers(void);
 
@@ -31,15 +31,15 @@ struct op_sample {
         unsigned long eip;
         unsigned long event;
 };
- 
+
 struct oprofile_cpu_buffer {
         volatile unsigned long head_pos;
         volatile unsigned long tail_pos;
         unsigned long buffer_size;
-        struct task_struct * last_task;
+        struct task_struct *last_task;
         int last_is_kernel;
         int tracing;
-        struct op_sample * buffer;
+        struct op_sample *buffer;
         unsigned long sample_received;
         unsigned long sample_lost_overflow;
         unsigned long backtrace_aborted;
@@ -50,7 +50,7 @@ struct oprofile_cpu_buffer {
 
 DECLARE_PER_CPU(struct oprofile_cpu_buffer, cpu_buffer);
 
-void cpu_buffer_reset(struct oprofile_cpu_buffer * cpu_buf);
+void cpu_buffer_reset(struct oprofile_cpu_buffer *cpu_buf);
 
 /* transient events for the CPU buffer -> event buffer */
 #define CPU_IS_KERNEL 1
diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
index 8d692a5c8e73..d962ba0dd87a 100644
--- a/drivers/oprofile/event_buffer.c
+++ b/drivers/oprofile/event_buffer.c
@@ -19,16 +19,16 @@
 #include <linux/dcookies.h>
 #include <linux/fs.h>
 #include <asm/uaccess.h>
- 
+
 #include "oprof.h"
 #include "event_buffer.h"
 #include "oprofile_stats.h"
 
 DEFINE_MUTEX(buffer_mutex);
- 
+
 static unsigned long buffer_opened;
 static DECLARE_WAIT_QUEUE_HEAD(buffer_wait);
-static unsigned long * event_buffer;
+static unsigned long *event_buffer;
 static unsigned long buffer_size;
 static unsigned long buffer_watershed;
 static size_t buffer_pos;
@@ -66,7 +66,7 @@ void wake_up_buffer_waiter(void)
         mutex_unlock(&buffer_mutex);
 }
 
- 
+
 int alloc_event_buffer(void)
 {
         int err = -ENOMEM;
@@ -76,13 +76,13 @@ int alloc_event_buffer(void)
         buffer_size = fs_buffer_size;
         buffer_watershed = fs_buffer_watershed;
         spin_unlock_irqrestore(&oprofilefs_lock, flags);
- 
+
         if (buffer_watershed >= buffer_size)
                 return -EINVAL;
- 
+
         event_buffer = vmalloc(sizeof(unsigned long) * buffer_size);
         if (!event_buffer)
-                goto out; 
+                goto out;
 
         err = 0;
 out:
@@ -97,8 +97,8 @@ void free_event_buffer(void)
         event_buffer = NULL;
 }
 
- 
-static int event_buffer_open(struct inode * inode, struct file * file)
+
+static int event_buffer_open(struct inode *inode, struct file *file)
 {
         int err = -EPERM;
 
@@ -116,14 +116,14 @@ static int event_buffer_open(struct inode * inode, struct file * file)
         file->private_data = dcookie_register();
         if (!file->private_data)
                 goto out;
-                 
+
         if ((err = oprofile_setup()))
                 goto fail;
 
         /* NB: the actual start happens from userspace
          * echo 1 >/dev/oprofile/enable
          */
- 
+
         return 0;
 
 fail:
@@ -134,7 +134,7 @@ out:
 }
 
 
-static int event_buffer_release(struct inode * inode, struct file * file)
+static int event_buffer_release(struct inode *inode, struct file *file)
 {
         oprofile_stop();
         oprofile_shutdown();
@@ -146,8 +146,8 @@ static int event_buffer_release(struct inode * inode, struct file * file)
 }
 
 
-static ssize_t event_buffer_read(struct file * file, char __user * buf,
-                                 size_t count, loff_t * offset)
+static ssize_t event_buffer_read(struct file *file, char __user *buf,
+                                 size_t count, loff_t *offset)
 {
         int retval = -EINVAL;
         size_t const max = buffer_size * sizeof(unsigned long);
@@ -172,18 +172,18 @@ static ssize_t event_buffer_read(struct file * file, char __user * buf,
         retval = -EFAULT;
 
         count = buffer_pos * sizeof(unsigned long);
- 
+
         if (copy_to_user(buf, event_buffer, count))
                 goto out;
 
         retval = count;
         buffer_pos = 0;
- 
+
 out:
         mutex_unlock(&buffer_mutex);
         return retval;
 }
- 
+
 const struct file_operations event_buffer_fops = {
         .open           = event_buffer_open,
         .release        = event_buffer_release,
diff --git a/drivers/oprofile/event_buffer.h b/drivers/oprofile/event_buffer.h
index 84bf324c5771..4e70749f8d16 100644
--- a/drivers/oprofile/event_buffer.h
+++ b/drivers/oprofile/event_buffer.h
@@ -10,13 +10,13 @@
 #ifndef EVENT_BUFFER_H
 #define EVENT_BUFFER_H
 
-#include <linux/types.h> 
+#include <linux/types.h>
 #include <asm/mutex.h>
- 
+
 int alloc_event_buffer(void);
 
 void free_event_buffer(void);
- 
+
 /**
  * Add data to the event buffer.
  * The data passed is free-form, but typically consists of
@@ -31,10 +31,10 @@ void wake_up_buffer_waiter(void);
 #define NO_COOKIE 0UL
 
 extern const struct file_operations event_buffer_fops;
- 
+
 /* mutex between sync_cpu_buffers() and the
  * file reading code.
  */
 extern struct mutex buffer_mutex;
- 
+
 #endif /* EVENT_BUFFER_H */
diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
index 2c645170f06e..cd375907f26f 100644
--- a/drivers/oprofile/oprof.c
+++ b/drivers/oprofile/oprof.c
@@ -19,7 +19,7 @@
 #include "cpu_buffer.h"
 #include "buffer_sync.h"
 #include "oprofile_stats.h"
- 
+
 struct oprofile_operations oprofile_ops;
 
 unsigned long oprofile_started;
@@ -36,7 +36,7 @@ static int timer = 0;
 int oprofile_setup(void)
 {
         int err;
- 
+
         mutex_lock(&start_mutex);
 
         if ((err = alloc_cpu_buffers()))
@@ -44,10 +44,10 @@ int oprofile_setup(void)
 
         if ((err = alloc_event_buffer()))
                 goto out1;
- 
+
         if (oprofile_ops.setup && (err = oprofile_ops.setup()))
                 goto out2;
- 
+
         /* Note even though this starts part of the
          * profiling overhead, it's necessary to prevent
          * us missing task deaths and eventually oopsing
@@ -74,7 +74,7 @@ post_sync:
         is_setup = 1;
         mutex_unlock(&start_mutex);
         return 0;
- 
+
 out3:
         if (oprofile_ops.shutdown)
                 oprofile_ops.shutdown();
@@ -92,17 +92,17 @@ out:
 int oprofile_start(void)
 {
         int err = -EINVAL;
- 
+
         mutex_lock(&start_mutex);
- 
+
         if (!is_setup)
                 goto out;
 
-        err = 0; 
- 
+        err = 0;
+
         if (oprofile_started)
                 goto out;
- 
+
         oprofile_reset_stats();
 
         if ((err = oprofile_ops.start()))
@@ -114,7 +114,7 @@ out:
         return err;
 }
 
- 
+
 /* echo 0>/dev/oprofile/enable */
 void oprofile_stop(void)
 {
@@ -204,13 +204,13 @@ static void __exit oprofile_exit(void)
         oprofile_arch_exit();
 }
 
- 
+
 module_init(oprofile_init);
 module_exit(oprofile_exit);
 
 module_param_named(timer, timer, int, 0644);
 MODULE_PARM_DESC(timer, "force use of timer interrupt");
- 
+
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("John Levon <levon@movementarian.org>");
 MODULE_DESCRIPTION("OProfile system profiler");
diff --git a/drivers/oprofile/oprof.h b/drivers/oprofile/oprof.h
index 18323650806e..5df0c21a608f 100644
--- a/drivers/oprofile/oprof.h
+++ b/drivers/oprofile/oprof.h
@@ -11,7 +11,7 @@
 #define OPROF_H
 
 int oprofile_setup(void);
-void oprofile_shutdown(void); 
+void oprofile_shutdown(void);
 
 int oprofilefs_register(void);
 void oprofilefs_unregister(void);
@@ -20,20 +20,20 @@ int oprofile_start(void);
 void oprofile_stop(void);
 
 struct oprofile_operations;
- 
+
 extern unsigned long fs_buffer_size;
 extern unsigned long fs_cpu_buffer_size;
 extern unsigned long fs_buffer_watershed;
 extern struct oprofile_operations oprofile_ops;
 extern unsigned long oprofile_started;
 extern unsigned long backtrace_depth;
- 
+
 struct super_block;
 struct dentry;
 
-void oprofile_create_files(struct super_block * sb, struct dentry * root);
-void oprofile_timer_init(struct oprofile_operations * ops);
+void oprofile_create_files(struct super_block *sb, struct dentry *root);
+void oprofile_timer_init(struct oprofile_operations *ops);
 
 int oprofile_set_backtrace(unsigned long depth);
- 
+
 #endif /* OPROF_H */
diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
index ef953ba5ab6b..cc106d503ace 100644
--- a/drivers/oprofile/oprofile_files.c
+++ b/drivers/oprofile/oprofile_files.c
@@ -13,18 +13,18 @@
 #include "event_buffer.h"
 #include "oprofile_stats.h"
 #include "oprof.h"
- 
+
 unsigned long fs_buffer_size = 131072;
 unsigned long fs_cpu_buffer_size = 8192;
 unsigned long fs_buffer_watershed = 32768; /* FIXME: tune */
 
-static ssize_t depth_read(struct file * file, char __user * buf, size_t count, loff_t * offset)
+static ssize_t depth_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
 {
         return oprofilefs_ulong_to_user(backtrace_depth, buf, count, offset);
 }
 
 
-static ssize_t depth_write(struct file * file, char const __user * buf, size_t count, loff_t * offset)
+static ssize_t depth_write(struct file *file, char const __user *buf, size_t count, loff_t *offset)
 {
         unsigned long val;
         int retval;
@@ -49,8 +49,8 @@ static const struct file_operations depth_fops = {
         .write          = depth_write
 };
 
- 
-static ssize_t pointer_size_read(struct file * file, char __user * buf, size_t count, loff_t * offset)
+
+static ssize_t pointer_size_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
 {
         return oprofilefs_ulong_to_user(sizeof(void *), buf, count, offset);
 }
@@ -61,24 +61,24 @@ static const struct file_operations pointer_size_fops = {
 };
 
 
-static ssize_t cpu_type_read(struct file * file, char __user * buf, size_t count, loff_t * offset)
+static ssize_t cpu_type_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
 {
         return oprofilefs_str_to_user(oprofile_ops.cpu_type, buf, count, offset);
 }
- 
- 
+
+
 static const struct file_operations cpu_type_fops = {
         .read           = cpu_type_read,
 };
- 
- 
-static ssize_t enable_read(struct file * file, char __user * buf, size_t count, loff_t * offset)
+
+
+static ssize_t enable_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
 {
         return oprofilefs_ulong_to_user(oprofile_started, buf, count, offset);
 }
 
 
-static ssize_t enable_write(struct file * file, char const __user * buf, size_t count, loff_t * offset)
+static ssize_t enable_write(struct file *file, char const __user *buf, size_t count, loff_t *offset)
 {
         unsigned long val;
         int retval;
@@ -89,7 +89,7 @@ static ssize_t enable_write(struct file * file, char const __user * buf, size_t
         retval = oprofilefs_ulong_from_user(&val, buf, count);
         if (retval)
                 return retval;
- 
+
         if (val)
                 retval = oprofile_start();
         else
@@ -100,14 +100,14 @@ static ssize_t enable_write(struct file * file, char const __user * buf, size_t
         return count;
 }
 
- 
+
 static const struct file_operations enable_fops = {
         .read           = enable_read,
         .write          = enable_write,
 };
 
 
-static ssize_t dump_write(struct file * file, char const __user * buf, size_t count, loff_t * offset)
+static ssize_t dump_write(struct file *file, char const __user *buf, size_t count, loff_t *offset)
 {
         wake_up_buffer_waiter();
         return count;
@@ -117,8 +117,8 @@ static ssize_t dump_write(struct file * file, char const __user * buf, size_t co
 static const struct file_operations dump_fops = {
         .write          = dump_write,
 };
- 
-void oprofile_create_files(struct super_block * sb, struct dentry * root)
+
+void oprofile_create_files(struct super_block *sb, struct dentry *root)
 {
         oprofilefs_create_file(sb, root, "enable", &enable_fops);
         oprofilefs_create_file_perm(sb, root, "dump", &dump_fops, 0666);
@@ -126,7 +126,7 @@ void oprofile_create_files(struct super_block * sb, struct dentry * root)
         oprofilefs_create_ulong(sb, root, "buffer_size", &fs_buffer_size);
         oprofilefs_create_ulong(sb, root, "buffer_watershed", &fs_buffer_watershed);
         oprofilefs_create_ulong(sb, root, "cpu_buffer_size", &fs_cpu_buffer_size);
-        oprofilefs_create_file(sb, root, "cpu_type", &cpu_type_fops); 
+        oprofilefs_create_file(sb, root, "cpu_type", &cpu_type_fops);
         oprofilefs_create_file(sb, root, "backtrace_depth", &depth_fops);
         oprofilefs_create_file(sb, root, "pointer_size", &pointer_size_fops);
         oprofile_create_stats_files(sb, root);
diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
index f99b28e7b79a..e1f6ce03705e 100644
--- a/drivers/oprofile/oprofile_stats.c
+++ b/drivers/oprofile/oprofile_stats.c
@@ -11,17 +11,17 @@
 #include <linux/smp.h>
 #include <linux/cpumask.h>
 #include <linux/threads.h>
- 
+
 #include "oprofile_stats.h"
 #include "cpu_buffer.h"
- 
+
 struct oprofile_stat_struct oprofile_stats;
- 
+
 void oprofile_reset_stats(void)
 {
-        struct oprofile_cpu_buffer * cpu_buf; 
+        struct oprofile_cpu_buffer *cpu_buf;
         int i;
- 
+
         for_each_possible_cpu(i) {
                 cpu_buf = &per_cpu(cpu_buffer, i);
                 cpu_buf->sample_received = 0;
@@ -29,18 +29,18 @@ void oprofile_reset_stats(void)
                 cpu_buf->backtrace_aborted = 0;
                 cpu_buf->sample_invalid_eip = 0;
         }
- 
+
         atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
         atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
         atomic_set(&oprofile_stats.event_lost_overflow, 0);
 }
 
 
-void oprofile_create_stats_files(struct super_block * sb, struct dentry * root)
+void oprofile_create_stats_files(struct super_block *sb, struct dentry *root)
 {
-        struct oprofile_cpu_buffer * cpu_buf;
-        struct dentry * cpudir;
-        struct dentry * dir;
+        struct oprofile_cpu_buffer *cpu_buf;
+        struct dentry *cpudir;
+        struct dentry *dir;
         char buf[10];
         int i;
 
@@ -52,7 +52,7 @@ void oprofile_create_stats_files(struct super_block * sb, struct dentry * root)
                 cpu_buf = &per_cpu(cpu_buffer, i);
                 snprintf(buf, 10, "cpu%d", i);
                 cpudir = oprofilefs_mkdir(sb, dir, buf);
- 
+
                 /* Strictly speaking access to these ulongs is racy,
                  * but we can't simply lock them, and they are
                  * informational only.
@@ -66,7 +66,7 @@ void oprofile_create_stats_files(struct super_block * sb, struct dentry * root)
                 oprofilefs_create_ro_ulong(sb, cpudir, "sample_invalid_eip",
                         &cpu_buf->sample_invalid_eip);
         }
- 
+
         oprofilefs_create_ro_atomic(sb, dir, "sample_lost_no_mm",
                 &oprofile_stats.sample_lost_no_mm);
         oprofilefs_create_ro_atomic(sb, dir, "sample_lost_no_mapping",
diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
index 6d755a633f15..3da0d08dc1f9 100644
--- a/drivers/oprofile/oprofile_stats.h
+++ b/drivers/oprofile/oprofile_stats.h
@@ -11,7 +11,7 @@
 #define OPROFILE_STATS_H
 
 #include <asm/atomic.h>
- 
+
 struct oprofile_stat_struct {
         atomic_t sample_lost_no_mm;
         atomic_t sample_lost_no_mapping;
@@ -20,14 +20,14 @@ struct oprofile_stat_struct {
 };
 
 extern struct oprofile_stat_struct oprofile_stats;
- 
+
 /* reset all stats to zero */
 void oprofile_reset_stats(void);
- 
+
 struct super_block;
 struct dentry;
- 
+
 /* create the stats/ dir */
-void oprofile_create_stats_files(struct super_block * sb, struct dentry * root);
+void oprofile_create_stats_files(struct super_block *sb, struct dentry *root);
 
 #endif /* OPROFILE_STATS_H */
diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
index 8543cb26cf34..ddc4c59f02dc 100644
--- a/drivers/oprofile/oprofilefs.c
+++ b/drivers/oprofile/oprofilefs.c
@@ -23,9 +23,9 @@
 
 DEFINE_SPINLOCK(oprofilefs_lock);
 
-static struct inode * oprofilefs_get_inode(struct super_block * sb, int mode)
+static struct inode *oprofilefs_get_inode(struct super_block *sb, int mode)
 {
-        struct inode * inode = new_inode(sb);
+        struct inode *inode = new_inode(sb);
 
         if (inode) {
                 inode->i_mode = mode;
@@ -44,7 +44,7 @@ static struct super_operations s_ops = {
 };
 
 
-ssize_t oprofilefs_str_to_user(char const * str, char __user * buf, size_t count, loff_t * offset)
+ssize_t oprofilefs_str_to_user(char const *str, char __user *buf, size_t count, loff_t *offset)
 {
         return simple_read_from_buffer(buf, count, offset, str, strlen(str));
 }
@@ -52,7 +52,7 @@ ssize_t oprofilefs_str_to_user(char const * str, char __user * buf, size_t count
 
 #define TMPBUFSIZE 50
 
-ssize_t oprofilefs_ulong_to_user(unsigned long val, char __user * buf, size_t count, loff_t * offset)
+ssize_t oprofilefs_ulong_to_user(unsigned long val, char __user *buf, size_t count, loff_t *offset)
 {
         char tmpbuf[TMPBUFSIZE];
         size_t maxlen = snprintf(tmpbuf, TMPBUFSIZE, "%lu\n", val);
@@ -62,7 +62,7 @@ ssize_t oprofilefs_ulong_to_user(unsigned long val, char __user * buf, size_t co
 }
 
 
-int oprofilefs_ulong_from_user(unsigned long * val, char const __user * buf, size_t count)
+int oprofilefs_ulong_from_user(unsigned long *val, char const __user *buf, size_t count)
 {
         char tmpbuf[TMPBUFSIZE];
         unsigned long flags;
@@ -85,16 +85,16 @@ int oprofilefs_ulong_from_user(unsigned long * val, char const __user * buf, siz
 }
 
 
-static ssize_t ulong_read_file(struct file * file, char __user * buf, size_t count, loff_t * offset)
+static ssize_t ulong_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
 {
-        unsigned long * val = file->private_data;
+        unsigned long *val = file->private_data;
         return oprofilefs_ulong_to_user(*val, buf, count, offset);
 }
 
 
-static ssize_t ulong_write_file(struct file * file, char const __user * buf, size_t count, loff_t * offset)
+static ssize_t ulong_write_file(struct file *file, char const __user *buf, size_t count, loff_t *offset)
 {
-        unsigned long * value = file->private_data;
+        unsigned long *value = file->private_data;
         int retval;
 
         if (*offset)
@@ -108,7 +108,7 @@ static ssize_t ulong_write_file(struct file * file, char const __user * buf, siz
 }
 
 
-static int default_open(struct inode * inode, struct file * filp)
+static int default_open(struct inode *inode, struct file *filp)
 {
         if (inode->i_private)
                 filp->private_data = inode->i_private;
@@ -129,12 +129,12 @@ static const struct file_operations ulong_ro_fops = {
 };
 
 
-static struct dentry * __oprofilefs_create_file(struct super_block * sb,
-        struct dentry * root, char const * name, const struct file_operations * fops,
+static struct dentry *__oprofilefs_create_file(struct super_block *sb,
+        struct dentry *root, char const *name, const struct file_operations *fops,
         int perm)
 {
-        struct dentry * dentry;
-        struct inode * inode;
+        struct dentry *dentry;
+        struct inode *inode;
 
         dentry = d_alloc_name(root, name);
         if (!dentry)
@@ -150,10 +150,10 @@ static struct dentry * __oprofilefs_create_file(struct super_block * sb,
 }
 
 
-int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
-        char const * name, unsigned long * val)
+int oprofilefs_create_ulong(struct super_block *sb, struct dentry *root,
+        char const *name, unsigned long *val)
 {
-        struct dentry * d = __oprofilefs_create_file(sb, root, name,
+        struct dentry *d = __oprofilefs_create_file(sb, root, name,
                                                      &ulong_fops, 0644);
         if (!d)
                 return -EFAULT;
@@ -163,10 +163,10 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
 }
 
 
-int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
-        char const * name, unsigned long * val)
+int oprofilefs_create_ro_ulong(struct super_block *sb, struct dentry *root,
+        char const *name, unsigned long *val)
 {
-        struct dentry * d = __oprofilefs_create_file(sb, root, name,
+        struct dentry *d = __oprofilefs_create_file(sb, root, name,
                                                      &ulong_ro_fops, 0444);
         if (!d)
                 return -EFAULT;
@@ -176,23 +176,23 @@ int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
 }
 
 
-static ssize_t atomic_read_file(struct file * file, char __user * buf, size_t count, loff_t * offset)
+static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
 {
-        atomic_t * val = file->private_data;
+        atomic_t *val = file->private_data;
         return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
 }
- 
+
 
 static const struct file_operations atomic_ro_fops = {
         .read           = atomic_read_file,
         .open           = default_open,
 };
- 
 
-int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
-        char const * name, atomic_t * val)
+
+int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
+        char const *name, atomic_t *val)
 {
-        struct dentry * d = __oprofilefs_create_file(sb, root, name,
+        struct dentry *d = __oprofilefs_create_file(sb, root, name,
                                                      &atomic_ro_fops, 0444);
         if (!d)
                 return -EFAULT;
@@ -201,9 +201,9 @@ int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
         return 0;
 }
 
- 
-int oprofilefs_create_file(struct super_block * sb, struct dentry * root,
-        char const * name, const struct file_operations * fops)
+
+int oprofilefs_create_file(struct super_block *sb, struct dentry *root,
+        char const *name, const struct file_operations *fops)
 {
         if (!__oprofilefs_create_file(sb, root, name, fops, 0644))
                 return -EFAULT;
@@ -211,8 +211,8 @@ int oprofilefs_create_file(struct super_block * sb, struct dentry * root,
 }
 
 
-int oprofilefs_create_file_perm(struct super_block * sb, struct dentry * root,
-        char const * name, const struct file_operations * fops, int perm)
+int oprofilefs_create_file_perm(struct super_block *sb, struct dentry *root,
+        char const *name, const struct file_operations *fops, int perm)
 {
         if (!__oprofilefs_create_file(sb, root, name, fops, perm))
                 return -EFAULT;
@@ -220,11 +220,11 @@ int oprofilefs_create_file_perm(struct super_block * sb, struct dentry * root,
 }
 
 
-struct dentry * oprofilefs_mkdir(struct super_block * sb,
-        struct dentry * root, char const * name)
+struct dentry *oprofilefs_mkdir(struct super_block *sb,
+        struct dentry *root, char const *name)
 {
-        struct dentry * dentry;
-        struct inode * inode;
+        struct dentry *dentry;
+        struct inode *inode;
 
         dentry = d_alloc_name(root, name);
         if (!dentry)
@@ -241,10 +241,10 @@ struct dentry * oprofilefs_mkdir(struct super_block * sb,
 }
 
 
-static int oprofilefs_fill_super(struct super_block * sb, void * data, int silent)
+static int oprofilefs_fill_super(struct super_block *sb, void *data, int silent)
 {
-        struct inode * root_inode;
-        struct dentry * root_dentry;
+        struct inode *root_inode;
+        struct dentry *root_dentry;
 
         sb->s_blocksize = PAGE_CACHE_SIZE;
         sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
index 710a45f0d734..333f915568c7 100644
--- a/drivers/oprofile/timer_int.c
+++ b/drivers/oprofile/timer_int.c
@@ -19,7 +19,7 @@
 
 static int timer_notify(struct pt_regs *regs)
 {
-        oprofile_add_sample(regs, 0);
+        oprofile_add_sample(regs, 0);
         return 0;
 }
 
@@ -35,7 +35,7 @@ static void timer_stop(void)
 }
 
 
-void __init oprofile_timer_init(struct oprofile_operations * ops)
+void __init oprofile_timer_init(struct oprofile_operations *ops)
 {
         ops->create_files = NULL;
         ops->setup = NULL;