3 files changed, 16 insertions, 5 deletions

diff --git a/arch/i386/kernel/cpu/mtrr/main.c b/arch/i386/kernel/cpu/mtrr/main.c
index 1cf466df330a..7202b98aac4f 100644
--- a/arch/i386/kernel/cpu/mtrr/main.c
+++ b/arch/i386/kernel/cpu/mtrr/main.c
@@ -734,10 +734,13 @@ void mtrr_ap_init(void)
  */
 void mtrr_save_state(void)
 {
-        if (smp_processor_id() == 0)
+        int cpu = get_cpu();
+
+        if (cpu == 0)
                 mtrr_save_fixed_ranges(NULL);
         else
                 smp_call_function_single(0, mtrr_save_fixed_ranges, NULL, 1, 1);
+        put_cpu();
 }
 
 static int __init mtrr_init_finialize(void)
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index c3219b29b5ac..4831edbae2d5 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -411,7 +411,7 @@ EXPORT_SYMBOL_GPL(spi_alloc_master);
  */
 int spi_register_master(struct spi_master *master)
 {
-        static atomic_t         dyn_bus_id = ATOMIC_INIT((1<<16) - 1);
+        static atomic_t         dyn_bus_id = ATOMIC_INIT((1<<15) - 1);
         struct device           *dev = master->cdev.dev;
         int                     status = -ENODEV;
         int                     dynamic = 0;
diff --git a/fs/ioctl.c b/fs/ioctl.c
index 479c1038ed4a..8c90cbc903fa 100644
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -12,6 +12,7 @@
 #include <linux/fs.h>
 #include <linux/security.h>
 #include <linux/module.h>
+#include <linux/kallsyms.h>
 
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
@@ -20,6 +21,7 @@ static long do_ioctl(struct file *filp, unsigned int cmd,
                 unsigned long arg)
 {
         int error = -ENOTTY;
+        void *f;
 
         if (!filp->f_op)
                 goto out;
@@ -29,10 +31,16 @@ static long do_ioctl(struct file *filp, unsigned int cmd,
                 if (error == -ENOIOCTLCMD)
                         error = -EINVAL;
                 goto out;
-        } else if (filp->f_op->ioctl) {
+        } else if ((f = filp->f_op->ioctl)) {
                 lock_kernel();
-                error = filp->f_op->ioctl(filp->f_path.dentry->d_inode,
-                                          filp, cmd, arg);
+                if (!filp->f_op->ioctl) {
+                        printk("%s: ioctl %p disappeared\n", __FUNCTION__, f);
+                        print_symbol("symbol: %s\n", (unsigned long)f);
+                        dump_stack();
+                } else {
+                        error = filp->f_op->ioctl(filp->f_path.dentry->d_inode,
+                                                  filp, cmd, arg);
+                }
                 unlock_kernel();
         }