Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks

1 files changed, 73 insertions, 64 deletions

diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index 6c6d35d68ee9..fac014a81b24 100644
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -8,6 +8,7 @@
 
 #include <linux/irq.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/interrupt.h>
 
 #include "internals.h"
@@ -16,23 +17,18 @@ static struct proc_dir_entry *root_irq_dir;
 
 #ifdef CONFIG_SMP
 
-static int irq_affinity_read_proc(char *page, char **start, off_t off,
-                                  int count, int *eof, void *data)
+static int irq_affinity_proc_show(struct seq_file *m, void *v)
 {
-        struct irq_desc *desc = irq_desc + (long)data;
+        struct irq_desc *desc = irq_to_desc((long)m->private);
         cpumask_t *mask = &desc->affinity;
-        int len;
 
 #ifdef CONFIG_GENERIC_PENDING_IRQ
         if (desc->status & IRQ_MOVE_PENDING)
                 mask = &desc->pending_mask;
 #endif
-        len = cpumask_scnprintf(page, count, *mask);
-
-        if (count - len < 2)
-                return -EINVAL;
-        len += sprintf(page + len, "\n");
-        return len;
+        seq_cpumask(m, mask);
+        seq_putc(m, '\n');
+        return 0;
 }
 
 #ifndef is_affinity_mask_valid
@@ -40,13 +36,14 @@ static int irq_affinity_read_proc(char *page, char **start, off_t off,
 #endif
 
 int no_irq_affinity;
-static int irq_affinity_write_proc(struct file *file, const char __user *buffer,
-                                   unsigned long count, void *data)
+static ssize_t irq_affinity_proc_write(struct file *file,
+                const char __user *buffer, size_t count, loff_t *pos)
 {
-        unsigned int irq = (int)(long)data, full_count = count, err;
+        unsigned int irq = (int)(long)PDE(file->f_path.dentry->d_inode)->data;
         cpumask_t new_value;
+        int err;
 
-        if (!irq_desc[irq].chip->set_affinity || no_irq_affinity ||
+        if (!irq_to_desc(irq)->chip->set_affinity || no_irq_affinity ||
             irq_balancing_disabled(irq))
                 return -EIO;
 
@@ -65,28 +62,38 @@ static int irq_affinity_write_proc(struct file *file, const char __user *buffer,
         if (!cpus_intersects(new_value, cpu_online_map))
                 /* Special case for empty set - allow the architecture
                    code to set default SMP affinity. */
-                return irq_select_affinity(irq) ? -EINVAL : full_count;
+                return irq_select_affinity(irq) ? -EINVAL : count;
 
         irq_set_affinity(irq, new_value);
 
-        return full_count;
+        return count;
 }
 
-static int default_affinity_read(char *page, char **start, off_t off,
-                                  int count, int *eof, void *data)
+static int irq_affinity_proc_open(struct inode *inode, struct file *file)
 {
-        int len = cpumask_scnprintf(page, count, irq_default_affinity);
-        if (count - len < 2)
-                return -EINVAL;
-        len += sprintf(page + len, "\n");
-        return len;
+        return single_open(file, irq_affinity_proc_show, PDE(inode)->data);
 }
 
-static int default_affinity_write(struct file *file, const char __user *buffer,
-                                   unsigned long count, void *data)
+static const struct file_operations irq_affinity_proc_fops = {
+        .open           = irq_affinity_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+        .write          = irq_affinity_proc_write,
+};
+
+static int default_affinity_show(struct seq_file *m, void *v)
+{
+        seq_cpumask(m, &irq_default_affinity);
+        seq_putc(m, '\n');
+        return 0;
+}
+
+static ssize_t default_affinity_write(struct file *file,
+                const char __user *buffer, size_t count, loff_t *ppos)
 {
-        unsigned int full_count = count, err;
         cpumask_t new_value;
+        int err;
 
         err = cpumask_parse_user(buffer, count, new_value);
         if (err)
@@ -105,27 +112,40 @@ static int default_affinity_write(struct file *file, const char __user *buffer,
 
         irq_default_affinity = new_value;
 
-        return full_count;
+        return count;
 }
+
+static int default_affinity_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, default_affinity_show, NULL);
+}
+
+static const struct file_operations default_affinity_proc_fops = {
+        .open           = default_affinity_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+        .write          = default_affinity_write,
+};
 #endif
 
 static int irq_spurious_read(char *page, char **start, off_t off,
                                   int count, int *eof, void *data)
 {
-        struct irq_desc *d = &irq_desc[(long) data];
+        struct irq_desc *desc = irq_to_desc((long) data);
         return sprintf(page, "count %u\n"
                              "unhandled %u\n"
                              "last_unhandled %u ms\n",
-                        d->irq_count,
-                        d->irqs_unhandled,
-                        jiffies_to_msecs(d->last_unhandled));
+                        desc->irq_count,
+                        desc->irqs_unhandled,
+                        jiffies_to_msecs(desc->last_unhandled));
 }
 
 #define MAX_NAMELEN 128
 
 static int name_unique(unsigned int irq, struct irqaction *new_action)
 {
-        struct irq_desc *desc = irq_desc + irq;
+        struct irq_desc *desc = irq_to_desc(irq);
         struct irqaction *action;
         unsigned long flags;
         int ret = 1;
@@ -145,8 +165,9 @@ static int name_unique(unsigned int irq, struct irqaction *new_action)
 void register_handler_proc(unsigned int irq, struct irqaction *action)
 {
         char name [MAX_NAMELEN];
+        struct irq_desc *desc = irq_to_desc(irq);
 
-        if (!irq_desc[irq].dir || action->dir || !action->name ||
+        if (!desc->dir || action->dir || !action->name ||
                                         !name_unique(irq, action))
                 return;
 
@@ -154,43 +175,34 @@ void register_handler_proc(unsigned int irq, struct irqaction *action)
         snprintf(name, MAX_NAMELEN, "%s", action->name);
 
         /* create /proc/irq/1234/handler/ */
-        action->dir = proc_mkdir(name, irq_desc[irq].dir);
+        action->dir = proc_mkdir(name, desc->dir);
 }
 
 #undef MAX_NAMELEN
 
 #define MAX_NAMELEN 10
 
-void register_irq_proc(unsigned int irq)
+void register_irq_proc(unsigned int irq, struct irq_desc *desc)
 {
         char name [MAX_NAMELEN];
         struct proc_dir_entry *entry;
 
-        if (!root_irq_dir ||
-                (irq_desc[irq].chip == &no_irq_chip) ||
-                        irq_desc[irq].dir)
+        if (!root_irq_dir || (desc->chip == &no_irq_chip) || desc->dir)
                 return;
 
         memset(name, 0, MAX_NAMELEN);
         sprintf(name, "%d", irq);
 
         /* create /proc/irq/1234 */
-        irq_desc[irq].dir = proc_mkdir(name, root_irq_dir);
+        desc->dir = proc_mkdir(name, root_irq_dir);
 
 #ifdef CONFIG_SMP
-        {
-                /* create /proc/irq/<irq>/smp_affinity */
-                entry = create_proc_entry("smp_affinity", 0600, irq_desc[irq].dir);
-
-                if (entry) {
-                        entry->data = (void *)(long)irq;
-                        entry->read_proc = irq_affinity_read_proc;
-                        entry->write_proc = irq_affinity_write_proc;
-                }
-        }
+        /* create /proc/irq/<irq>/smp_affinity */
+        proc_create_data("smp_affinity", 0600, desc->dir,
+                         &irq_affinity_proc_fops, (void *)(long)irq);
 #endif
 
-        entry = create_proc_entry("spurious", 0444, irq_desc[irq].dir);
+        entry = create_proc_entry("spurious", 0444, desc->dir);
         if (entry) {
                 entry->data = (void *)(long)irq;
                 entry->read_proc = irq_spurious_read;
@@ -201,28 +213,25 @@ void register_irq_proc(unsigned int irq)
 
 void unregister_handler_proc(unsigned int irq, struct irqaction *action)
 {
-        if (action->dir)
-                remove_proc_entry(action->dir->name, irq_desc[irq].dir);
+        if (action->dir) {
+                struct irq_desc *desc = irq_to_desc(irq);
+
+                remove_proc_entry(action->dir->name, desc->dir);
+        }
 }
 
 void register_default_affinity_proc(void)
 {
 #ifdef CONFIG_SMP
-        struct proc_dir_entry *entry;
-
-        /* create /proc/irq/default_smp_affinity */
-        entry = create_proc_entry("default_smp_affinity", 0600, root_irq_dir);
-        if (entry) {
-                entry->data = NULL;
-                entry->read_proc  = default_affinity_read;
-                entry->write_proc = default_affinity_write;
-        }
+        proc_create("irq/default_smp_affinity", 0600, NULL,
+                    &default_affinity_proc_fops);
 #endif
 }
 
 void init_irq_proc(void)
 {
-        int i;
+        unsigned int irq;
+        struct irq_desc *desc;
 
         /* create /proc/irq */
         root_irq_dir = proc_mkdir("irq", NULL);
@@ -234,7 +243,7 @@ void init_irq_proc(void)
         /*
          * Create entries for all existing IRQs.
          */
-        for (i = 0; i < NR_IRQS; i++)
-                register_irq_proc(i);
+        for_each_irq_desc(irq, desc)
+                register_irq_proc(irq, desc);
 }