Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	net/sunrpc/auth_gss/gss_krb5_crypto.c
	net/sunrpc/auth_gss/gss_spkm3_token.c
	net/sunrpc/clnt.c

Merge with mainline and fix conflicts.

1 files changed, 25 insertions, 4 deletions

diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index 5a99e3e0c96d..d92c48e0d7a6 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -17,6 +17,7 @@
  *
  */
 
+#include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/fs.h>
@@ -34,6 +35,7 @@
 #include <linux/sched.h>
 #include <linux/wait.h>
 #include <asm/mipsmtregs.h>
+#include <asm/mips_mt.h>
 #include <asm/cacheflush.h>
 #include <asm/atomic.h>
 #include <asm/cpu.h>
@@ -63,7 +65,7 @@ extern void *vpe_get_shared(int index);
 
 static void rtlx_dispatch(void)
 {
-        do_IRQ(MIPSCPU_INT_BASE + MIPS_CPU_RTLX_IRQ);
+        do_IRQ(MIPS_CPU_IRQ_BASE + MIPS_CPU_RTLX_IRQ);
 }
 
 
@@ -476,7 +478,7 @@ static ssize_t file_write(struct file *file, const char __user * buffer,
         return rtlx_write(minor, (void *)buffer, count, 1);
 }
 
-static struct file_operations rtlx_fops = {
+static const struct file_operations rtlx_fops = {
         .owner =   THIS_MODULE,
         .open =    file_open,
         .release = file_release,
@@ -491,14 +493,15 @@ static struct irqaction rtlx_irq = {
         .name           = "RTLX",
 };
 
-static int rtlx_irq_num = MIPSCPU_INT_BASE + MIPS_CPU_RTLX_IRQ;
+static int rtlx_irq_num = MIPS_CPU_IRQ_BASE + MIPS_CPU_RTLX_IRQ;
 
 static char register_chrdev_failed[] __initdata =
         KERN_ERR "rtlx_module_init: unable to register device\n";
 
 static int rtlx_module_init(void)
 {
-        int i;
+        struct device *dev;
+        int i, err;
 
         major = register_chrdev(0, module_name, &rtlx_fops);
         if (major < 0) {
@@ -511,6 +514,13 @@ static int rtlx_module_init(void)
                 init_waitqueue_head(&channel_wqs[i].rt_queue);
                 init_waitqueue_head(&channel_wqs[i].lx_queue);
                 channel_wqs[i].in_open = 0;
+
+                dev = device_create(mt_class, NULL, MKDEV(major, i),
+                                    "%s%d", module_name, i);
+                if (IS_ERR(dev)) {
+                        err = PTR_ERR(dev);
+                        goto out_chrdev;
+                }
         }
 
         /* set up notifiers */
@@ -525,10 +535,21 @@ static int rtlx_module_init(void)
         setup_irq(rtlx_irq_num, &rtlx_irq);
 
         return 0;
+
+out_chrdev:
+        for (i = 0; i < RTLX_CHANNELS; i++)
+                device_destroy(mt_class, MKDEV(major, i));
+
+        return err;
 }
 
 static void __exit rtlx_module_exit(void)
 {
+        int i;
+
+        for (i = 0; i < RTLX_CHANNELS; i++)
+                device_destroy(mt_class, MKDEV(major, i));
+
         unregister_chrdev(major, module_name);
 }