linux-next: build failure after merge of the final tree (ieee1394 tree related)

linux-next: build failure after merge of the final tree (ieee1394 tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 690 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc allyesconfig)
failed like this:

drivers/firewire/ohci.c: In function 'ar_context_release':
drivers/firewire/ohci.c:635: error: implicit declaration of function 'vm_unmap_ram'
drivers/firewire/ohci.c: In function 'ar_context_init':
drivers/firewire/ohci.c:961: error: implicit declaration of function 'vm_map_ram'

Caused by commit 713c11a3fd56c8324b5cd63d02cb270866095ea4 ("firewire:
ohci: Asynchronous Reception rewrite").

I have used the version of the ieee1394 from next-20101210 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 --]

[PATCH] firewire: ohci: fix build failure

[Stefan Richter]

vm_map_ram() needs <linux/vmalloc.h>.
(And bring the includes back into alphabetical order.)

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---
 drivers/firewire/ohci.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: b/drivers/firewire/ohci.c
===================================================================
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -18,6 +18,7 @@
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
@@ -40,7 +41,7 @@
 #include <linux/spinlock.h>
 #include <linux/string.h>
 #include <linux/time.h>
-#include <linux/bitops.h>
+#include <linux/vmalloc.h>
 
 #include <asm/byteorder.h>
 #include <asm/page.h>


-- 
Stefan Richter
-=====-==-=- ==-- -==-=
http://arcgraph.de/sr/