debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

[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".
This commit is contained in:
Ben Hutchings 2018-10-05 18:11:21 +01:00
parent 4d44c6ff32
commit 10190f3972
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -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 <ben@decadent.org.uk> Fri, 05 Oct 2018 18:09:26 +0100
linux (4.18.10-1) unstable; urgency=medium
* New upstream stable update:

3
debian/patches-rt/of-allocate-free-phandle-cache-outside-of-the-devtre.patch vendored
View File

@ -37,7 +37,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ 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;