From: Jan-Simon Moeller Date: Fri, 8 Sep 2017 17:02:49 +0000 (+0000) Subject: Revert "Forward port local-arm-futex patch to poky morty HEAD" X-Git-Tag: 4.99.1~38 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F43%2F10843%2F3;p=AGL%2Fmeta-agl.git Revert "Forward port local-arm-futex patch to poky morty HEAD" Pyro does not contain the extra patch to remove # undef __ASSUME_REQUEUE_PI Thus we add it back by reverting this morty-specific change. This reverts commit 3d32b328ebece6019b118c83f56150b5c6947cd5. Bug-AGL: SPEC-853 Change-Id: I66e7a3ef524a6923444915b0135ec6a79942ec5c Signed-off-by: Jan-Simon Möller Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10843 --- diff --git a/meta-agl/recipes-core/glibc/glibc/arm/local-arm-futex.diff b/meta-agl/recipes-core/glibc/glibc/arm/local-arm-futex.diff index 27d1144d0..c6b9d53a1 100644 --- a/meta-agl/recipes-core/glibc/glibc/arm/local-arm-futex.diff +++ b/meta-agl/recipes-core/glibc/glibc/arm/local-arm-futex.diff @@ -18,5 +18,6 @@ Last-Update: 2015-03-25 configuration. */ -#if __LINUX_KERNEL_VERSION < 0x030E03 +#if __LINUX_KERNEL_VERSION < 0x020620 + # undef __ASSUME_REQUEUE_PI # undef __ASSUME_SET_ROBUST_LIST #endif