Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix branch emulation for floating-point exceptions.
  [MIPS] Cleanup inode->r_dev usage.
  [MIPS] Update MIPS defconfigs.
  [MIPS] Get rid of CONFIG_ADVANCED.
  [MIPS] Kconfig: Clarify description of CROSSCOMPILE.
  [MIPS] 24K LV: Add core card id.
  [MIPS] Sparse: fix sparse for 64-bit kernels.
  [MIPS] Use __ffs() instead of ffs() in ip32_irq0().
  [MIPS] Fix bitops for MIPS32/MIPS64 CPUs.
  [MIPS] Fix ip27 build.
  [MIPS] Oprofile: fix sparse warning.
  [MIPS] Fix oprofile module unloading

3 files changed, 9 insertions, 10 deletions

diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c
index 374de839558d..b6232d9033cb 100644
--- a/arch/mips/kernel/branch.c
+++ b/arch/mips/kernel/branch.c
@@ -184,7 +184,7 @@ int __compute_return_epc(struct pt_regs *regs)
                 bit = (insn.i_format.rt >> 2);
                 bit += (bit != 0);
                 bit += 23;
-                switch (insn.i_format.rt) {
+                switch (insn.i_format.rt & 3) {
                 case 0: /* bc1f */
                 case 2: /* bc1fl */
                         if (~fcr31 & (1 << bit))
diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index 6179805af9f0..caf777f83289 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -398,15 +398,14 @@ ssize_t rtlx_write(int index, void *buffer, size_t count, int user)
 
 static int file_open(struct inode *inode, struct file *filp)
 {
-        int minor = MINOR(inode->i_rdev);
+        int minor = iminor(inode);
 
         return rtlx_open(minor, (filp->f_flags & O_NONBLOCK) ? 0 : 1);
 }
 
 static int file_release(struct inode *inode, struct file *filp)
 {
-        int minor;
-        minor = MINOR(inode->i_rdev);
+        int minor = iminor(inode);
 
         return rtlx_release(minor);
 }
@@ -416,7 +415,7 @@ static unsigned int file_poll(struct file *file, poll_table * wait)
         int minor;
         unsigned int mask = 0;
 
-        minor = MINOR(file->f_dentry->d_inode->i_rdev);
+        minor = iminor(file->f_dentry->d_inode);
 
         poll_wait(file, &channel_wqs[minor].rt_queue, wait);
         poll_wait(file, &channel_wqs[minor].lx_queue, wait);
@@ -438,7 +437,7 @@ static unsigned int file_poll(struct file *file, poll_table * wait)
 static ssize_t file_read(struct file *file, char __user * buffer, size_t count,
                          loff_t * ppos)
 {
-        int minor = MINOR(file->f_dentry->d_inode->i_rdev);
+        int minor = iminor(file->f_dentry->d_inode);
 
         /* data available? */
         if (!rtlx_read_poll(minor, (file->f_flags & O_NONBLOCK) ? 0 : 1)) {
@@ -455,7 +454,7 @@ static ssize_t file_write(struct file *file, const char __user * buffer,
         struct rtlx_channel *rt;
         DECLARE_WAITQUEUE(wait, current);
 
-        minor = MINOR(file->f_dentry->d_inode->i_rdev);
+        minor = iminor(file->f_dentry->d_inode);
         rt = &rtlx->channel[minor];
 
         /* any space left... */
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 80ffaa6d50ad..85d7df7b18e1 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -1072,7 +1072,7 @@ static int vpe_open(struct inode *inode, struct file *filp)
         struct vpe_notifications *not;
 
         /* assume only 1 device at the mo. */
-        if ((minor = MINOR(inode->i_rdev)) != 1) {
+        if ((minor = iminor(inode)) != 1) {
                 printk(KERN_WARNING "VPE loader: only vpe1 is supported\n");
                 return -ENODEV;
         }
@@ -1133,7 +1133,7 @@ static int vpe_release(struct inode *inode, struct file *filp)
         struct vpe *v;
         Elf_Ehdr *hdr;
 
-        minor = MINOR(inode->i_rdev);
+        minor = iminor(inode);
         if ((v = get_vpe(minor)) == NULL)
                 return -ENODEV;
 
@@ -1174,7 +1174,7 @@ static ssize_t vpe_write(struct file *file, const char __user * buffer,
         size_t ret = count;
         struct vpe *v;
 
-        minor = MINOR(file->f_dentry->d_inode->i_rdev);
+        minor = iminor(file->f_dentry->d_inode);
         if ((v = get_vpe(minor)) == NULL)
                 return -ENODEV;