bpf: enable access to ax register also from verifier rewrite

[linux-2.6-microblaze.git] / kernel / irq / irqdesc.c

diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
index 578d0e5..ee062b7 100644 (file)
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -449,30 +449,34 @@ static void free_desc(unsigned int irq)
 }
 
 static int alloc_descs(unsigned int start, unsigned int cnt, int node,
-                      const struct cpumask *affinity, struct module *owner)
+                      const struct irq_affinity_desc *affinity,
+                      struct module *owner)
 {
-       const struct cpumask *mask = NULL;
        struct irq_desc *desc;
-       unsigned int flags;
        int i;
 
        /* Validate affinity mask(s) */
        if (affinity) {
-               for (i = 0, mask = affinity; i < cnt; i++, mask++) {
-                       if (cpumask_empty(mask))
+               for (i = 0; i < cnt; i++, i++) {
+                       if (cpumask_empty(&affinity[i].mask))
                                return -EINVAL;
                }
        }
 
-       flags = affinity ? IRQD_AFFINITY_MANAGED | IRQD_MANAGED_SHUTDOWN : 0;
-       mask = NULL;
-
        for (i = 0; i < cnt; i++) {
+               const struct cpumask *mask = NULL;
+               unsigned int flags = 0;
+
                if (affinity) {
-                       node = cpu_to_node(cpumask_first(affinity));
-                       mask = affinity;
+                       if (affinity->is_managed) {
+                               flags = IRQD_AFFINITY_MANAGED |
+                                       IRQD_MANAGED_SHUTDOWN;
+                       }
+                       mask = &affinity->mask;
+                       node = cpu_to_node(cpumask_first(mask));
                        affinity++;
                }
+
                desc = alloc_desc(start + i, node, flags, mask, owner);
                if (!desc)
                        goto err;
@@ -575,7 +579,7 @@ static void free_desc(unsigned int irq)
 }
 
 static inline int alloc_descs(unsigned int start, unsigned int cnt, int node,
-                             const struct cpumask *affinity,
+                             const struct irq_affinity_desc *affinity,
                              struct module *owner)
 {
        u32 i;
@@ -705,7 +709,7 @@ EXPORT_SYMBOL_GPL(irq_free_descs);
  */
 int __ref
 __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node,
-                 struct module *owner, const struct cpumask *affinity)
+                 struct module *owner, const struct irq_affinity_desc *affinity)
 {
        int start, ret;