Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[pandora-kernel.git] / include / linux / padata.h

diff --git a/include/linux/padata.h b/include/linux/padata.h
index bdcd1e9..4633b2f 100644 (file)
--- a/include/linux/padata.h
+++ b/include/linux/padata.h
@@ -127,8 +127,8 @@ struct padata_cpumask {
  */
 struct parallel_data {
        struct padata_instance          *pinst;
-       struct padata_parallel_queue    *pqueue;
-       struct padata_serial_queue      *squeue;
+       struct padata_parallel_queue    __percpu *pqueue;
+       struct padata_serial_queue      __percpu *squeue;
        atomic_t                        seq_nr;
        atomic_t                        reorder_objects;
        atomic_t                        refcnt;