summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/BUILD_RUNTIME_BUG_ON-vs-gcc7.patch43
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.12.4.bb2
2 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/BUILD_RUNTIME_BUG_ON-vs-gcc7.patch b/meta/recipes-kernel/lttng/lttng-modules/BUILD_RUNTIME_BUG_ON-vs-gcc7.patch
deleted file mode 100644
index 76063607a8..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/BUILD_RUNTIME_BUG_ON-vs-gcc7.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From ab07574ef90fa510f293c37897d577066a88fe0d Mon Sep 17 00:00:00 2001
2From: Nathan Lynch <nathan_lynch@mentor.com>
3Date: Tue, 25 Apr 2017 16:26:57 -0500
4Subject: [PATCH] BUILD_RUNTIME_BUG_ON vs gcc7
5
6Avoid using LTTng's BUILD_RUNTIME_BUG_ON macro, as it appears to run
7into a similar problem as Linux experienced with ilog2.
8
9See:
10https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=474c90156c8dcc2fa815e6716cc9394d7930cb9c
11https://gcc.gnu.org/bugzilla/show_bug.cgi?id=72785
12
13Upstream-Status: Pending
14Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
15---
16 lib/align.h | 4 ++--
17 1 file changed, 2 insertions(+), 2 deletions(-)
18
19diff --git a/lib/align.h b/lib/align.h
20index 5b91ae87410b..5e134cd485fe 100644
21--- a/lib/align.h
22+++ b/lib/align.h
23@@ -48,7 +48,7 @@
24 */
25 #define offset_align(align_drift, alignment) \
26 ({ \
27- BUILD_RUNTIME_BUG_ON((alignment) == 0 \
28+ BUG_ON((alignment) == 0 \
29 || ((alignment) & ((alignment) - 1))); \
30 (((alignment) - (align_drift)) & ((alignment) - 1)); \
31 })
32@@ -63,7 +63,7 @@
33 */
34 #define offset_align_floor(align_drift, alignment) \
35 ({ \
36- BUILD_RUNTIME_BUG_ON((alignment) == 0 \
37+ BUG_ON((alignment) == 0 \
38 || ((alignment) & ((alignment) - 1))); \
39 (((align_drift) - (alignment)) & ((alignment) - 1)); \
40 })
41--
422.9.3
43
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.12.4.bb b/meta/recipes-kernel/lttng/lttng-modules_2.12.4.bb
index 3d4e5f5c75..73f3931717 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.12.4.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.12.4.bb
@@ -10,7 +10,6 @@ include lttng-platforms.inc
10 10
11SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ 11SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
12 file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ 12 file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
13 file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
14 " 13 "
15 14
16SRC_URI[sha256sum] = "fe66400fa1b85bff1b9ae24419c74e3bb7d358d643eade0594d81b48bd190688" 15SRC_URI[sha256sum] = "fe66400fa1b85bff1b9ae24419c74e3bb7d358d643eade0594d81b48bd190688"
@@ -34,7 +33,6 @@ LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=3f882d431dc0f32f1f44c07
34DEFAULT_PREFERENCE_class-devupstream = "-1" 33DEFAULT_PREFERENCE_class-devupstream = "-1"
35SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.12 \ 34SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.12 \
36 file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \ 35 file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch \
37 file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
38 " 36 "
39SRCREV_class-devupstream = "be71b60a327d7ad2588abc5cad2861177119972b" 37SRCREV_class-devupstream = "be71b60a327d7ad2588abc5cad2861177119972b"
40PV_class-devupstream = "2.12.3+git${SRCPV}" 38PV_class-devupstream = "2.12.3+git${SRCPV}"