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
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 $@
+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
--- /dev/null
+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];
-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