From 10190f39721f45d9e748a7d9be38f7632f217d31 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 5 Oct 2018 18:11:21 +0100 Subject: [PATCH] [rt][arm64,armhf] Fix build failure after rebasing onto 4.18.10 The rt patch "of: allocate / free phandle cache outside of the devtree_lock" drops the lock earlier in of_populate_phandle_cache() and removes the "out" label which is no longer needed. 4.18.10 includes "of: fix phandle cache creation for DTs with no phandles" which adds another "goto out" inside the locked section. The previous textual conflict resolution between these changes left the "goto out" in place, but it needs to be a "return". --- debian/changelog | 6 ++++++ ...-allocate-free-phandle-cache-outside-of-the-devtre.patch | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 841cc44cf..afb10498b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux (4.18.10-2) UNRELEASED; urgency=medium + + * [rt][arm64,armhf] Fix build failure after rebasing onto 4.18.10 + + -- Ben Hutchings Fri, 05 Oct 2018 18:09:26 +0100 + linux (4.18.10-1) unstable; urgency=medium * New upstream stable update: diff --git a/debian/patches-rt/of-allocate-free-phandle-cache-outside-of-the-devtre.patch b/debian/patches-rt/of-allocate-free-phandle-cache-outside-of-the-devtre.patch index 19cc858d5..42bd68531 100644 --- a/debian/patches-rt/of-allocate-free-phandle-cache-outside-of-the-devtre.patch +++ b/debian/patches-rt/of-allocate-free-phandle-cache-outside-of-the-devtre.patch @@ -37,7 +37,8 @@ Signed-off-by: Sebastian Andrzej Siewior + raw_spin_unlock_irqrestore(&devtree_lock, flags); + if (!phandles) - goto out; +- goto out; ++ return; cache_entries = roundup_pow_of_two(phandles); phandle_cache_mask = cache_entries - 1;