Package: release.debian.org Severity: normal Tags: stretch User: release.debian....@packages.debian.org Usertags: pu
Hi, The attached diff fixes a build failure of the dkms modules on the linux-rt flavor of the debian linux kernel. This was reported at: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=864404 I'd appreciate if you consider allowing this upload to stretch. Thanks, Michael -- System Information: Debian Release: 9.1 APT prefers stable APT policy: (500, 'stable') Architecture: i386 (i686) Kernel: Linux 4.9.0-4-686-pae (SMP w/2 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8), LANGUAGE=en_CA:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
diff --git a/debian/changelog b/debian/changelog index f458a42..0dfc818 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lttng-modules (2.9.0-1+deb9u1) stable; urgency=medium + + * [c3d8eab] Stretch gbp branch config + * [ee40323] Fix build on linux-rt 4.9 kernels. (Closes: #864404) + + -- Michael Jeanson <mjean...@ubuntu.com> Mon, 16 Oct 2017 15:25:06 -0400 + lttng-modules (2.9.0-1) unstable; urgency=medium * [500ac85] New upstream version 2.9.0 diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..b174468 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +upstream-branch=upstream/2.9.0 +debian-branch=debian/stretch diff --git a/debian/patches/fix-linux-rt-4.9-sched.patch b/debian/patches/fix-linux-rt-4.9-sched.patch new file mode 100644 index 0000000..63b5303 --- /dev/null +++ b/debian/patches/fix-linux-rt-4.9-sched.patch @@ -0,0 +1,31 @@ +Fix build of sched instrumentation on linux-rt >= 4.9.27-rt8 +--- a/instrumentation/events/lttng-module/sched.h ++++ b/instrumentation/events/lttng-module/sched.h +@@ -540,7 +540,26 @@ + ) + #endif + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0) || \ ++ (LTTNG_KERNEL_RANGE(4,9,27, 4,10,0) && defined(CONFIG_PREEMPT_RT_FULL))) ++/* ++ * Tracepoint for showing priority inheritance modifying a tasks ++ * priority. ++ */ ++LTTNG_TRACEPOINT_EVENT(sched_pi_setprio, ++ ++ TP_PROTO(struct task_struct *tsk, struct task_struct *pi_task), ++ ++ TP_ARGS(tsk, pi_task), ++ ++ TP_FIELDS( ++ ctf_array_text(char, comm, tsk->comm, TASK_COMM_LEN) ++ ctf_integer(pid_t, tid, tsk->pid) ++ ctf_integer(int, oldprio, tsk->prio - MAX_RT_PRIO) ++ ctf_integer(int, newprio, pi_task ? pi_task->prio - MAX_RT_PRIO : tsk->prio - MAX_RT_PRIO) ++ ) ++) ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) + /* + * Tracepoint for showing priority inheritance modifying a tasks + * priority. diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..ada1602 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-linux-rt-4.9-sched.patch
