Merge branches 'irq-core-for-linus' and 'core-locking-for-linus' of git://git.kernel...

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Fix up irq_node() for irq_data changes.
  genirq: Add single IRQ reservation helper
  genirq: Warn if enable_irq is called before irq is set up

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  semaphore: Remove mutex emulation
  staging: Final semaphore cleanup
  jbd2: Convert jbd2_slab_create_sem to mutex
  hpfs: Convert sbi->hpfs_creation_de to mutex

Fix up trivial change/delete conflicts with deleted 'dream' drivers
(drivers/staging/dream/camera/{mt9d112.c,mt9p012_fox.c,mt9t013.c,s5k3e2fx.c})

diff --combined drivers/staging/smbfs/inode.c
index f9c493591ce75f151ead6fbbeed379cb5a8a1290,450c9194198861483daa183fb6582e1c9790eadb,fa42f40fa2266cc41cd4e20b371d1d7fddc8c44e..540a984bb5160d5942902575803c6c79b087d507
--- 1/drivers/staging/smbfs/inode.c
--- 2/fs/smbfs/inode.c
--- 3/drivers/staging/smbfs/inode.c
+++ b/drivers/staging/smbfs/inode.c
@@@@ -26,13 -26,13 -26,13 +26,13 @@@@
   #include <linux/vfs.h>
   #include <linux/highuid.h>
   #include <linux/sched.h>
 - #include <linux/smb_fs.h>
 - #include <linux/smbno.h>
 - #include <linux/smb_mount.h>
   
   #include <asm/system.h>
   #include <asm/uaccess.h>
   
 + #include "smb_fs.h"
 + #include "smbno.h"
 + #include "smb_mount.h"
   #include "smb_debug.h"
   #include "getopt.h"
   #include "proto.h"
@@@@ -229,6 -229,7 -229,6 +229,6 @@@@ smb_invalidate_inodes(struct smb_sb_inf
   {
        VERBOSE("\n");
        shrink_dcache_sb(SB_of(server));
 -      invalidate_inodes(SB_of(server));
   }
   
   /*
@@@@ -500,12 -501,10 -500,12 +500,12 @@@@ static int smb_fill_super(struct super_
        void *mem;
        static int warn_count;
   
 +      lock_kernel();
 + 
        if (warn_count < 5) {
                warn_count++;
                printk(KERN_EMERG "smbfs is deprecated and will be removed"
 -                      " from the 2.6.27 kernel. Please migrate to cifs\n");
 +                      " from the 2.6.37 kernel. Please migrate to cifs\n");
        }
   
        if (!raw_data)
@@@@ -537,7 -536,7 -537,7 +537,7 @@@@
        server->mnt = NULL;
        server->sock_file = NULL;
        init_waitqueue_head(&server->conn_wq);
--      init_MUTEX(&server->sem);
++      sema_init(&server->sem, 1);
        INIT_LIST_HEAD(&server->entry);
        INIT_LIST_HEAD(&server->xmitq);
        INIT_LIST_HEAD(&server->recvq);
@@@@ -622,7 -621,6 -622,7 +622,7 @@@@
   
        smb_new_dentry(sb->s_root);
   
 +      unlock_kernel();
        return 0;
   
   out_no_root:
@@@@ -645,11 -643,9 -645,11 +645,11 @@@@ out_wrong_data
   out_no_data:
        printk(KERN_ERR "smb_fill_super: missing data argument\n");
   out_fail:
 +      unlock_kernel();
        return -EINVAL;
   out_no_server:
        printk(KERN_ERR "smb_fill_super: cannot allocate struct smb_sb_info\n");
 +      unlock_kernel();
        return -ENOMEM;
   }
   
@@@@ -793,16 -789,16 -793,16 +793,16 @@@@ out
        return error;
   }
   
 --static int smb_get_sb(struct file_system_type *fs_type,
 --     int flags, const char *dev_name, void *data, struct vfsmount *mnt)
 ++static struct dentry *smb_mount(struct file_system_type *fs_type,
 ++     int flags, const char *dev_name, void *data)
   {
 --     return get_sb_nodev(fs_type, flags, data, smb_fill_super, mnt);
 ++     return mount_nodev(fs_type, flags, data, smb_fill_super);
   }
   
   static struct file_system_type smb_fs_type = {
        .owner          = THIS_MODULE,
        .name           = "smbfs",
 --     .get_sb         = smb_get_sb,
 ++     .mount          = smb_mount,
        .kill_sb        = kill_anon_super,
        .fs_flags       = FS_BINARY_MOUNTDATA,
   };

diff --combined fs/hpfs/super.c
index bb69389972eb33148dfdc4176ea87b7003cb39f0,2607010be2fe5019b9700926d57c0f272be79f17,18e1d4566ecfe5df8b1f074fd9d2129ad173d3ee..6c5f01597c3af07a21ec162b996437545c6e13af
--- 1/fs/hpfs/super.c
--- 2/fs/hpfs/super.c
--- 3/fs/hpfs/super.c
+++ b/fs/hpfs/super.c
@@@@ -477,21 -477,17 -477,21 +477,21 @@@@ static int hpfs_fill_super(struct super
   
        int o;
   
 +      lock_kernel();
 + 
        save_mount_options(s, options);
   
        sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
 -      if (!sbi)
 +      if (!sbi) {
 +              unlock_kernel();
                return -ENOMEM;
 +      }
        s->s_fs_info = sbi;
   
        sbi->sb_bmp_dir = NULL;
        sbi->sb_cp_table = NULL;
   
--      init_MUTEX(&sbi->hpfs_creation_de);
++      mutex_init(&sbi->hpfs_creation_de);
   
        uid = current_uid();
        gid = current_gid();
@@@@ -670,7 -666,6 -670,7 +670,7 @@@@
                        root->i_blocks = 5;
                hpfs_brelse4(&qbh);
        }
 +      unlock_kernel();
        return 0;
   
   bail4:       brelse(bh2);
@@@@ -682,20 -677,20 -682,21 +682,20 @@@@ bail0
        kfree(sbi->sb_cp_table);
        s->s_fs_info = NULL;
        kfree(sbi);
 +      unlock_kernel();
        return -EINVAL;
   }
   
 --static int hpfs_get_sb(struct file_system_type *fs_type,
 --     int flags, const char *dev_name, void *data, struct vfsmount *mnt)
 ++static struct dentry *hpfs_mount(struct file_system_type *fs_type,
 ++     int flags, const char *dev_name, void *data)
   {
 --     return get_sb_bdev(fs_type, flags, dev_name, data, hpfs_fill_super,
 --                        mnt);
 ++     return mount_bdev(fs_type, flags, dev_name, data, hpfs_fill_super);
   }
   
   static struct file_system_type hpfs_fs_type = {
        .owner          = THIS_MODULE,
        .name           = "hpfs",
 --     .get_sb         = hpfs_get_sb,
 ++     .mount          = hpfs_mount,
        .kill_sb        = kill_block_super,
        .fs_flags       = FS_REQUIRES_DEV,
   };