Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/p54/p54common.c

1 files changed, 4 insertions, 16 deletions

diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
index c327b21bca81..bf4c4a979abb 100644
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
@@ -499,22 +499,10 @@ sigill:
 
 asmlinkage void do_ade(struct pt_regs *regs)
 {
-        extern int do_dsemulret(struct pt_regs *);
         unsigned int __user *pc;
         mm_segment_t seg;
 
         /*
-         * Address errors may be deliberately induced by the FPU emulator to
-         * retake control of the CPU after executing the instruction in the
-         * delay slot of an emulated branch.
-         */
-        /* Terminate if exception was recognized as a delay slot return */
-        if (do_dsemulret(regs))
-                return;
-
-        /* Otherwise handle as normal */
-
-        /*
          * Did we catch a fault trying to load an instruction?
          * Or are we running in MIPS16 mode?
          */
@@ -560,12 +548,12 @@ static int __init debugfs_unaligned(void)
                 return -ENODEV;
         d = debugfs_create_u32("unaligned_instructions", S_IRUGO,
                                mips_debugfs_dir, &unaligned_instructions);
-        if (IS_ERR(d))
-                return PTR_ERR(d);
+        if (!d)
+                return -ENOMEM;
         d = debugfs_create_u32("unaligned_action", S_IRUGO | S_IWUSR,
                                mips_debugfs_dir, &unaligned_action);
-        if (IS_ERR(d))
-                return PTR_ERR(d);
+        if (!d)
+                return -ENOMEM;
         return 0;
 }
 __initcall(debugfs_unaligned);