[Pkg-xen-devel] Bug#717157: blktap-dkms: Fails to build against Linux 3.10

[Ritesh Raj Sarraf]

Package: blktap-dkms
Followup-For: Bug #717157

I picked the commits from upstream. You should consider pushing it to
the archive.


root at ibmx3650m2-210-147:/usr/src/blktap-2.0.91# diff -Naru ring.c
/tmp/ring.c 
--- ring.c      2013-09-17 11:47:27.468200000 -0400
+++ /tmp/ring.c 2013-09-17 11:47:56.836200000 -0400
@@ -210,7 +210,7 @@
 
        pgoff = 1 + request->usr_idx * BLKTAP_SEGMENT_MAX;
 
-       addr = do_mmap_pgoff(filp, addr, len, prot, flags, pgoff);
+       addr = vm_mmap(filp, addr, len, prot, flags, pgoff <<
PAGE_SHIFT);
 
        return IS_ERR_VALUE(addr) ? addr : 0;
 }
@@ -230,8 +230,7 @@
        addr  = MMAP_VADDR(ring->user_vstart, request->usr_idx, 0);
        len   = request->nr_pages << PAGE_SHIFT;
 
-       err = do_munmap(current->mm, addr, len);
-
+       err = vm_munmap(addr, len);
        WARN_ON_ONCE(err);
 }
 


-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (101, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.11-trunk-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_IN, LC_CTYPE=en_IN (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash