add fix to make DRBD compile easier

diff --git a/Makefile b/Makefile
index 4c951bb94fc1ec1beb021564d5a88062ae3c0fc2..cae92eb4b1b8d4c7ecee41fb2108d08b5bf66a6b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=3.1
 
 KERNEL_VER=2.6.32
-PKGREL=115
+PKGREL=116
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=27
@@ -170,6 +170,7 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        cd ${KERNEL_SRC}; patch -p1 <../kbuild-generate-mudules-builtin.patch
        cd ${KERNEL_SRC}; patch -p1 <../add-tiocgdev-ioctl.patch
        cd ${KERNEL_SRC}; patch -p1 <../fix-nfs-block-count.patch
+       cd ${KERNEL_SRC}; patch -p1 <../fix-idr-header-for-drbd-compilation.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 

diff --git a/changelog.Debian b/changelog.Debian
index 4406026d8f217da3ebb5ffebf8f2f376b9d769d5..78e74aa156d0174ce69709d688a8dbaeff4ad3ff 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-116) unstable; urgency=low
+
+  * fix idr.h header
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 03 Dec 2013 06:20:45 +0100
+
 pve-kernel-2.6.32 (2.6.32-115) unstable; urgency=low
 
   * update to vzkernel-2.6.32-042stab083.2.src.rpm

diff --git a/fix-idr-header-for-drbd-compilation.patch b/fix-idr-header-for-drbd-compilation.patch
new file mode 100644 (file)
index 0000000..e54867e
--- /dev/null
+++ b/fix-idr-header-for-drbd-compilation.patch
@@ -0,0 +1,20 @@
+The DRBD module does not compile without that 
+
+Those definitions are part of the original RHEL kernel. Not sure
+why openvz patches removes that.
+
+--- ../linux-2.6-2.6.32/include/linux/idr.h    2013-11-14 11:18:46.000000000 +0100
++++ linux-2.6.32-358.23.2.el6/include/linux/idr.h      2013-09-14 10:52:55.000000000 +0200
+@@ -42,6 +42,12 @@
+ #define MAX_ID_BIT (1U << MAX_ID_SHIFT)
+ #define MAX_ID_MASK (MAX_ID_BIT - 1)
+ 
++/* Leave the possibility of an incomplete final layer */
++#define MAX_LEVEL (MAX_ID_SHIFT + IDR_BITS - 1) / IDR_BITS
++
++/* Number of id_layer structs to leave in free list */
++#define IDR_FREE_MAX MAX_LEVEL + MAX_LEVEL
++
+ struct idr_layer {
+       unsigned long            bitmap; /* A zero bit means "space here" */
+       struct idr_layer        *ary[1<<IDR_BITS];

diff --git a/proxmox-ve/changelog.Debian b/proxmox-ve/changelog.Debian
index 06580c9bdbe7217c01d2e2c09c847dc7d83dc422..c791db803dcb2a212c77f8d37d899982d4ef6a4e 100644 (file)
--- a/proxmox-ve/changelog.Debian
+++ b/proxmox-ve/changelog.Debian
@@ -1,4 +1,4 @@
-proxmox-ve-2.6.32 (3.1-115) unstable; urgency=low
+proxmox-ve-2.6.32 (3.1-116) unstable; urgency=low
 
   * re-package to update version number for 3.1 release