Merge commit 'v2.6.32-rc4' into perf/core

Merge reason: we were on an -rc1 base, merge up to -rc4.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 11 deletions

diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index a10ebfdc28ae..364f066cb497 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -72,8 +72,9 @@ static void rtlx_dispatch(void)
 */
 static irqreturn_t rtlx_interrupt(int irq, void *dev_id)
 {
+        unsigned int vpeflags;
+        unsigned long flags;
         int i;
-        unsigned int flags, vpeflags;
 
         /* Ought not to be strictly necessary for SMTC builds */
         local_irq_save(flags);
@@ -392,20 +393,12 @@ out:
 
 static int file_open(struct inode *inode, struct file *filp)
 {
-        int minor = iminor(inode);
-        int err;
-
-        lock_kernel();
-        err = rtlx_open(minor, (filp->f_flags & O_NONBLOCK) ? 0 : 1);
-        unlock_kernel();
-        return err;
+        return rtlx_open(iminor(inode), (filp->f_flags & O_NONBLOCK) ? 0 : 1);
 }
 
 static int file_release(struct inode *inode, struct file *filp)
 {
-        int minor = iminor(inode);
-
-        return rtlx_release(minor);
+        return rtlx_release(iminor(inode));
 }
 
 static unsigned int file_poll(struct file *file, poll_table * wait)