Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / connector / cn_proc.c

diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
index a7f046b0096ca26121a1016922fef359ee4d805c..2b46a7efa0ac78c5c4213609d7846422842ef17f 100644 (file)
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
@@ -43,9 +43,10 @@ static DEFINE_PER_CPU(__u32, proc_event_counts) = { 0 };
 
 static inline void get_seq(__u32 *ts, int *cpu)
 {
-       *ts = get_cpu_var(proc_event_counts)++;
+       preempt_disable();
+       *ts = __this_cpu_inc_return(proc_event_counts) -1;
        *cpu = smp_processor_id();
-       put_cpu_var(proc_event_counts);
+       preempt_enable();
 }
 
 void proc_fork_connector(struct task_struct *task)