* linux-next: build failure after merge of the bkl-procfs tree
@ 2010-04-13 5:27 Stephen Rothwell
2010-04-13 20:54 ` [PATCH] sunrpc: Include missing smp_lock.h Frederic Weisbecker
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-04-13 5:27 UTC (permalink / raw)
To: "Frédéric Weisbecker"; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 686 bytes --]
Hi "Frédéric,
After merging the bkl-procfs tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
net/sunrpc/cache.c: In function 'cache_ioctl_procfs':
net/sunrpc/cache.c:1355: error: implicit declaration of function 'lock_kernel'
net/sunrpc/cache.c:1359: error: implicit declaration of function 'unlock_kernel'
Caused by commit 64ef834551d7696f54553d7608eba80a5a800e77 ("procfs: Push
down the bkl from ioctl"). Forgot to include linux/smp_lock.h? See
Documentation/SubmitChecklist Rule #1.
I have dropped the bkl-procfs tree for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] sunrpc: Include missing smp_lock.h
2010-04-13 5:27 linux-next: build failure after merge of the bkl-procfs tree Stephen Rothwell
@ 2010-04-13 20:54 ` Frederic Weisbecker
0 siblings, 0 replies; 2+ messages in thread
From: Frederic Weisbecker @ 2010-04-13 20:54 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
On Tue, Apr 13, 2010 at 03:27:41PM +1000, Stephen Rothwell wrote:
> Hi "Frédéric,
>
> After merging the bkl-procfs tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> net/sunrpc/cache.c: In function 'cache_ioctl_procfs':
> net/sunrpc/cache.c:1355: error: implicit declaration of function 'lock_kernel'
> net/sunrpc/cache.c:1359: error: implicit declaration of function 'unlock_kernel'
>
> Caused by commit 64ef834551d7696f54553d7608eba80a5a800e77 ("procfs: Push
> down the bkl from ioctl"). Forgot to include linux/smp_lock.h? See
> Documentation/SubmitChecklist Rule #1.
>
> I have dropped the bkl-procfs tree for today.
Sorry about this.
I have pushed the following fix in the bkl/procfs branch.
Thanks.
---
Author: Frederic Weisbecker <fweisbec@gmail.com>
Date: Tue Apr 13 22:46:36 2010 +0200
sunrpc: Include missing smp_lock.h
Now that cache_ioctl_procfs() calls the bkl explicitly, we need to
include the relevant header as well.
This fixes the following build error:
net/sunrpc/cache.c: In function 'cache_ioctl_procfs':
net/sunrpc/cache.c:1355: error: implicit declaration of function 'lock_kernel'
net/sunrpc/cache.c:1359: error: implicit declaration of function 'unlock_kernel'
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index 3212357..59ef938 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -28,6 +28,7 @@
#include <linux/workqueue.h>
#include <linux/mutex.h>
#include <linux/pagemap.h>
+#include <linux/smp_lock.h>
#include <asm/ioctls.h>
#include <linux/sunrpc/types.h>
#include <linux/sunrpc/cache.h>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-13 20:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-04-13 5:27 linux-next: build failure after merge of the bkl-procfs tree Stephen Rothwell
2010-04-13 20:54 ` [PATCH] sunrpc: Include missing smp_lock.h Frederic Weisbecker
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).