* linux-next: build failure after merge of the bkl-config tree
@ 2010-11-16 2:08 Stephen Rothwell
2010-11-16 9:21 ` Arnd Bergmann
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2010-11-16 2:08 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 658 bytes --]
Hi Arnd,
After merging the bkl-config tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
kernel/sched.c: In function 'schedule':
kernel/sched.c:3896: error: implicit declaration of function 'release_kernel_lock'
kernel/sched.c:3960: error: implicit declaration of function 'reacquire_kernel_lock'
Caused by commit 8bbc75c71b8a821edd8abb43452c78fbfd4789dc ("BKL: remove
extraneous #include <smp_lock.h>"). Not well build tested :-(
I have used the version of the bkl-config tree from next-20101115 for
today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the bkl-config tree
2010-11-16 2:08 linux-next: build failure after merge of the bkl-config tree Stephen Rothwell
@ 2010-11-16 9:21 ` Arnd Bergmann
0 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2010-11-16 9:21 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
On Tuesday 16 November 2010 03:08:53 Stephen Rothwell wrote:
> After merging the bkl-config tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> kernel/sched.c: In function 'schedule':
> kernel/sched.c:3896: error: implicit declaration of function 'release_kernel_lock'
> kernel/sched.c:3960: error: implicit declaration of function 'reacquire_kernel_lock'
>
> Caused by commit 8bbc75c71b8a821edd8abb43452c78fbfd4789dc ("BKL: remove
> extraneous #include <smp_lock.h>"). Not well build tested :-(
Yes, and bad timing. I noticed this in a build test after uploading it,
and uploaded the fixed tree half an hour later, just after you pulleed it :(
Sorry about this, next time I'll do it in the right order.
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the bkl-config tree
2011-03-15 7:48 ` Stephen Rothwell
(?)
(?)
@ 2011-03-15 12:59 ` Arnd Bergmann
-1 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2011-03-15 12:59 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Andy Adamson, Boaz Harrosh,
Dean Hildebrand, Fred Isaman, Mike Sager, Fred Isaman,
Mingyang Guo, Ricardo Labiaga, Tao Guo, Benny Halevy,
Trond Myklebust
On Tuesday 15 March 2011, Stephen Rothwell wrote:
> After merging the bkl-config tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> fs/nfs/read.c:21:28: error: linux/smp_lock.h: No such file or directory
>
> Caused by commit 64419a9b2093 ("NFSv4.1: generic read") from the nfs tree
> interacting with commit 4ba8216cd905 ("BKL: That's all, folks") from the
> bkl-config tree.
>
> I couldn't see that this include file was needed, so I applied the patch
> below (which Trond could apply to his tree, I am pretty sure). (I am not
> sure why module.h is included either.)
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 15 Mar 2011 18:37:09 +1100
> Subject: [PATCH] nfs: BKL is no longer needed, so remove the include
>
The fix is good. I have one patch in bkl-config that removes all instances
of #include <linux/smp_lock.h> treewide. Obviously that doesn't
help where new ones creep in, so we have to eliminate them one
by one.
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the bkl-config tree
2011-03-15 7:48 ` Stephen Rothwell
(?)
@ 2011-03-15 12:46 ` Trond Myklebust
-1 siblings, 0 replies; 6+ messages in thread
From: Trond Myklebust @ 2011-03-15 12:46 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, linux-next, linux-kernel, Andy Adamson,
Boaz Harrosh, Dean Hildebrand, Fred Isaman, Mike Sager,
Fred Isaman, Mingyang Guo, Ricardo Labiaga, Tao Guo,
Benny Halevy
On Tue, 2011-03-15 at 18:48 +1100, Stephen Rothwell wrote:
> Hi Arnd,
>
> After merging the bkl-config tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> fs/nfs/read.c:21:28: error: linux/smp_lock.h: No such file or directory
>
> Caused by commit 64419a9b2093 ("NFSv4.1: generic read") from the nfs tree
> interacting with commit 4ba8216cd905 ("BKL: That's all, folks") from the
> bkl-config tree.
>
> I couldn't see that this include file was needed, so I applied the patch
> below (which Trond could apply to his tree, I am pretty sure). (I am not
> sure why module.h is included either.)
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 15 Mar 2011 18:37:09 +1100
> Subject: [PATCH] nfs: BKL is no longer needed, so remove the include
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> fs/nfs/read.c | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/fs/nfs/read.c b/fs/nfs/read.c
> index 4b764c6..7cded2b 100644
> --- a/fs/nfs/read.c
> +++ b/fs/nfs/read.c
> @@ -18,7 +18,6 @@
> #include <linux/sunrpc/clnt.h>
> #include <linux/nfs_fs.h>
> #include <linux/nfs_page.h>
> -#include <linux/smp_lock.h>
> #include <linux/module.h>
>
> #include <asm/system.h>
> --
> 1.7.4.1
Thanks Stephen! Applied to the nfs-for-2.6.39 tree.
Cheers
Trond
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@netapp.com
www.netapp.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: build failure after merge of the bkl-config tree
@ 2011-03-15 7:48 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2011-03-15 7:48 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-next, linux-kernel, Andy Adamson, Boaz Harrosh,
Dean Hildebrand, Fred Isaman, Mike Sager, Fred Isaman,
Mingyang Guo, Ricardo Labiaga, Tao Guo, Andy Adamson,
Benny Halevy, Trond Myklebust
Hi Arnd,
After merging the bkl-config tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
fs/nfs/read.c:21:28: error: linux/smp_lock.h: No such file or directory
Caused by commit 64419a9b2093 ("NFSv4.1: generic read") from the nfs tree
interacting with commit 4ba8216cd905 ("BKL: That's all, folks") from the
bkl-config tree.
I couldn't see that this include file was needed, so I applied the patch
below (which Trond could apply to his tree, I am pretty sure). (I am not
sure why module.h is included either.)
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Mar 2011 18:37:09 +1100
Subject: [PATCH] nfs: BKL is no longer needed, so remove the include
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/nfs/read.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 4b764c6..7cded2b 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -18,7 +18,6 @@
#include <linux/sunrpc/clnt.h>
#include <linux/nfs_fs.h>
#include <linux/nfs_page.h>
-#include <linux/smp_lock.h>
#include <linux/module.h>
#include <asm/system.h>
--
1.7.4.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 6+ messages in thread
* linux-next: build failure after merge of the bkl-config tree
@ 2011-03-15 7:48 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2011-03-15 7:48 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-next, linux-kernel, Andy Adamson, Boaz Harrosh,
Dean Hildebrand, Fred Isaman, Mike Sager, Fred Isaman,
Mingyang Guo, Ricardo Labiaga, Tao Guo
Hi Arnd,
After merging the bkl-config tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
fs/nfs/read.c:21:28: error: linux/smp_lock.h: No such file or directory
Caused by commit 64419a9b2093 ("NFSv4.1: generic read") from the nfs tree
interacting with commit 4ba8216cd905 ("BKL: That's all, folks") from the
bkl-config tree.
I couldn't see that this include file was needed, so I applied the patch
below (which Trond could apply to his tree, I am pretty sure). (I am not
sure why module.h is included either.)
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Mar 2011 18:37:09 +1100
Subject: [PATCH] nfs: BKL is no longer needed, so remove the include
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/nfs/read.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 4b764c6..7cded2b 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -18,7 +18,6 @@
#include <linux/sunrpc/clnt.h>
#include <linux/nfs_fs.h>
#include <linux/nfs_page.h>
-#include <linux/smp_lock.h>
#include <linux/module.h>
#include <asm/system.h>
--
1.7.4.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-03-15 12:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-11-16 2:08 linux-next: build failure after merge of the bkl-config tree Stephen Rothwell
2010-11-16 9:21 ` Arnd Bergmann
2011-03-15 7:48 Stephen Rothwell
2011-03-15 7:48 ` Stephen Rothwell
2011-03-15 12:46 ` Trond Myklebust
2011-03-15 12:59 ` Arnd Bergmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.