[PATCH cleanup] Re: + mips-vpe-remove-leftover-unlock_kernel.patch added to -mm tree

[PATCH cleanup] Re: + mips-vpe-remove-leftover-unlock_kernel.patch added to -mm tree

[John Kacur]

On Tue, 3 Nov 2009, Andrew Morton wrote:

> On Tue, 3 Nov 2009 15:09:53 +0100 Ralf Baechle <ralf@linux-mips.org> wrote:
> 
> > On Mon, Nov 02, 2009 at 11:01:38PM -0800, akpm@linux-foundation.org wrote:
> > 
> > I already have an equivalent patch in the MIPS kernel - Linus only needs
> > to finally pull ...
> > 
> 
> I didn't see such a patch in yesterday's linux-next..
> 

Linus picked-up Ralf's version of the patch for 2.6.32-rc6
a22d621c80fb08f668ae3bfe62aeaae64b0b2b89

That has the important part that removes the stray unlock_kernel, but
unfortunately doesn't remove the smp_lock.h header.

So, the last patch is just a clean-up. (no urgency).

>From ae20d9169893112daaad1dc3af9f8559003a2bfb Mon Sep 17 00:00:00 2001
From: John Kacur <jkacur@redhat.com>
Date: Tue, 3 Nov 2009 22:15:55 +0100
Subject: [PATCH] Remove BKL header.

Now that the bkl has been removed, also remove the smp_lock.h include

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

diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 6047752..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>
-- 
1.6.0.6

Re: [PATCH cleanup] Re: + mips-vpe-remove-leftover-unlock_kernel.patch added to -mm tree

[Ralf Baechle]

On Tue, Nov 03, 2009 at 10:52:41PM +0100, John Kacur wrote:

> > > I already have an equivalent patch in the MIPS kernel - Linus only needs
> > > to finally pull ...
> > > 
> > 
> > I didn't see such a patch in yesterday's linux-next..

I only have stuff to be pulled for 2.6.33 on my -next tree.  Anything for
2.6.32 was in another tree.

> Linus picked-up Ralf's version of the patch for 2.6.32-rc6
> a22d621c80fb08f668ae3bfe62aeaae64b0b2b89
> 
> That has the important part that removes the stray unlock_kernel, but
> unfortunately doesn't remove the smp_lock.h header.
> 
> So, the last patch is just a clean-up. (no urgency).
> 
> >From ae20d9169893112daaad1dc3af9f8559003a2bfb Mon Sep 17 00:00:00 2001
> From: John Kacur <jkacur@redhat.com>
> Date: Tue, 3 Nov 2009 22:15:55 +0100
> Subject: [PATCH] Remove BKL header.
> 
> Now that the bkl has been removed, also remove the smp_lock.h include

In fact every single use of <linux/smp_lock.h> in arch/mips/ is unnecessary;
see patch for 2.6.33 in

http://www.linux-mips.org/git?p=upstream-sfr.git;a=commit;h=defde8dd822ddbab4ea1f8d2f5831e693bc75ad4

  Ralf

Re: [PATCH cleanup] Re: + mips-vpe-remove-leftover-unlock_kernel.patch added to -mm tree

[John Kacur]

On Tue, Nov 3, 2009 at 11:15 PM, Ralf Baechle <ralf@linux-mips.org> wrote:
> On Tue, Nov 03, 2009 at 10:52:41PM +0100, John Kacur wrote:
>
>> > > I already have an equivalent patch in the MIPS kernel - Linus only needs
>> > > to finally pull ...
>> > >
>> >
>> > I didn't see such a patch in yesterday's linux-next..
>
> I only have stuff to be pulled for 2.6.33 on my -next tree.  Anything for
> 2.6.32 was in another tree.
>
>> Linus picked-up Ralf's version of the patch for 2.6.32-rc6
>> a22d621c80fb08f668ae3bfe62aeaae64b0b2b89
>>
>> That has the important part that removes the stray unlock_kernel, but
>> unfortunately doesn't remove the smp_lock.h header.
>>
>> So, the last patch is just a clean-up. (no urgency).
>>
>> >From ae20d9169893112daaad1dc3af9f8559003a2bfb Mon Sep 17 00:00:00 2001
>> From: John Kacur <jkacur@redhat.com>
>> Date: Tue, 3 Nov 2009 22:15:55 +0100
>> Subject: [PATCH] Remove BKL header.
>>
>> Now that the bkl has been removed, also remove the smp_lock.h include
>
> In fact every single use of <linux/smp_lock.h> in arch/mips/ is unnecessary;
> see patch for 2.6.33 in
>
> http://www.linux-mips.org/git?p=upstream-sfr.git;a=commit;h=defde8dd822ddbab4ea1f8d2f5831e693bc75ad4
>
>  Ralf

Ah, great! Thanks Ralf.