Re: [PATCH] MIPS: VPE: Remove leftover unlock_kernel()

[John Kacur <jkacur@redhat.com>]

On Sun, 18 Oct 2009, John Kacur wrote:

> Please push the following patch to Linus for 2.6.32-rc6.
> (or else drop 1bbfc20d0161cd94b1b8111566be2fa41b41b608)
> 
> From aaf663d27d2ce9641df5833163f47fdb9ba9c833 Mon Sep 17 00:00:00 2001
> From: John Kacur <jkacur@redhat.com>
> Date: Sun, 18 Oct 2009 15:00:35 +0200
> Subject: [PATCH] MIPS: VPE: Remove leftover unlock_kernel()
> 
> commit 1bbfc20d0161cd94b1b8111566be2fa41b41b608
> was supposed to have removed the BKL, but there is a leftover and unpaired
> unlock_kernel call in the function vpe_open. Remove it.
> 
> Signed-off-by: John Kacur <jkacur@redhat.com>
> ---
>  arch/mips/kernel/vpe.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
> index 03092ab..6047752 100644
> --- a/arch/mips/kernel/vpe.c
> +++ b/arch/mips/kernel/vpe.c
> @@ -1116,8 +1116,6 @@ static int vpe_open(struct inode *inode, struct file *filp)
>  	v->shared_ptr = NULL;
>  	v->__start = 0;
>  
> -	unlock_kernel();
> -
>  	return 0;
>  }
>  
> -- 
> 1.6.0.6
> 

Arghhh - my apologies, we really should remove the smp_lock.h include too.
Respun patch below.

>From c492799a4f89d1869dcf40d8c12d7a9ac530916f Mon Sep 17 00:00:00 2001
From: John Kacur <jkacur@redhat.com>
Date: Sun, 18 Oct 2009 15:00:35 +0200
Subject: [PATCH] MIPS: VPE: Remove leftover unlock_kernel()

commit 1bbfc20d0161cd94b1b8111566be2fa41b41b608
was supposed to have removed the BKL, but there is a leftover and unpaired
unlock_kernel call in the function vpe_open. Remove it.

Signed-off-by: John Kacur <jkacur@redhat.com>
---
 arch/mips/kernel/vpe.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 03092ab..2bd2151 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -38,7 +38,6 @@
 #include <linux/vmalloc.h>
 #include <linux/elf.h>
 #include <linux/seq_file.h>
-#include <linux/smp_lock.h>
 #include <linux/syscalls.h>
 #include <linux/moduleloader.h>
 #include <linux/interrupt.h>
@@ -1116,8 +1115,6 @@ static int vpe_open(struct inode *inode, struct file *filp)
 	v->shared_ptr = NULL;
 	v->__start = 0;
 
-	unlock_kernel();
-
 	return 0;
 }
 
-- 
1.6.0.6