tags 742515 + patch tags 742515 + pending thanks Dear maintainer,
I've prepared an NMU for blktap-dkms (versioned as 2.0.93-0.2) and uploaded it directly to the archive as discussed on IRC. Regards.
diff -Nru blktap-dkms-2.0.93/debian/changelog blktap-dkms-2.0.93/debian/changelog --- blktap-dkms-2.0.93/debian/changelog 2013-11-18 15:37:48.000000000 +0100 +++ blktap-dkms-2.0.93/debian/changelog 2014-04-27 12:13:50.000000000 +0200 @@ -1,3 +1,11 @@ +blktap-dkms (2.0.93-0.2) unstable; urgency=medium + + * Non-maintainer upload. + * Add patch from upstream to support Linux kernels >= 3.7. + Closes: #742515 + + -- Evgeni Golov <evg...@debian.org> Sun, 27 Apr 2014 12:10:36 +0200 + blktap-dkms (2.0.93-0.1) unstable; urgency=high * Non-maintainer upload. diff -Nru blktap-dkms-2.0.93/debian/patches/fix-vm-reserved.patch blktap-dkms-2.0.93/debian/patches/fix-vm-reserved.patch --- blktap-dkms-2.0.93/debian/patches/fix-vm-reserved.patch 1970-01-01 01:00:00.000000000 +0100 +++ blktap-dkms-2.0.93/debian/patches/fix-vm-reserved.patch 2014-04-27 12:10:30.000000000 +0200 @@ -0,0 +1,43 @@ +From: Vincent Bernardoff <vincent.bernard...@citrix.com> +Date: Tue, 26 Feb 2013 16:03:35 +0000 +Origin: upstream, https://github.com/xen-org/blktap-dkms/commit/3bd35d662de12139b7ed5b6dc1076a231a651d10 +Bug-Debian: https://bugs.debian.org/742515 +Subject: [PATCH] Changed flag VM_RESERVED to VM_DONTDUMP to provide + compatibility with Linux 3.7 onwards. + +Index: blktap-dkms-2.0.93/ring.c +=================================================================== +--- blktap-dkms-2.0.93.orig/ring.c 2014-04-27 12:10:05.858102759 +0200 ++++ blktap-dkms-2.0.93/ring.c 2014-04-27 12:10:05.854102721 +0200 +@@ -28,6 +28,13 @@ + #include <linux/mman.h> + #include <linux/mm.h> + ++/* VM_RESERVED has disappeared starting from Linux 3.7 and has been ++ * replaced by VM_DONTDUMP since then. ++ */ ++#ifndef VM_DONTDUMP ++#define VM_DONTDUMP VM_RESERVED ++#endif ++ + #include "blktap.h" + + int blktap_ring_major; +@@ -436,7 +443,7 @@ + } + + vma->vm_flags |= VM_DONTCOPY; +- vma->vm_flags |= VM_RESERVED; ++ vma->vm_flags |= VM_DONTDUMP; + + return 0; + } +@@ -472,7 +479,7 @@ + vma->vm_private_data = tap; + + vma->vm_flags |= VM_DONTCOPY; +- vma->vm_flags |= VM_RESERVED; ++ vma->vm_flags |= VM_DONTDUMP; + + vma->vm_ops = &blktap_ring_vm_operations; + diff -Nru blktap-dkms-2.0.93/debian/patches/series blktap-dkms-2.0.93/debian/patches/series --- blktap-dkms-2.0.93/debian/patches/series 2013-11-18 15:27:56.000000000 +0100 +++ blktap-dkms-2.0.93/debian/patches/series 2014-04-27 12:07:43.000000000 +0200 @@ -1 +1,2 @@ fixes-DEST_MODULE_LOCATION-in-dkms.conf.patch +fix-vm-reserved.patch
