Skip to contentSkip to conversation

linux-next: build failure after merge of the bkl-procfs tree

PATCH New Stephen Rothwell 2 participants 2 messages Apr 13, 2010

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

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.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
#1 lore raw

PATCH 1/1 sunrpc: Include missing smp_lock.h

Quoted 9 lines · Stephen Rothwell

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'

Quoted 5 lines

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 <[email protected]>
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'

net/sunrpc/cache.c +1 -0
index 3212357..59ef938 100644
@@ -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>