Message ID | CAKp6GAteR2SomeyTdUcb1UdeAe5Mgv6ymLugGGrsehvf4h+VjA@mail.gmail.com |
---|---|
State | New |
Headers | show |
On Fri, Dec 19, 2014 at 12:52:20PM -0500, Craig Magina wrote: > This contains two upstream commits backported from utopic. > > BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1404335 > > > The following changes since commit 892d23edba04d9a97e9843e85be961e52aa2d604: > > UBUNTU: Ubuntu-3.13.0-44.73 (2014-12-15 16:01:34 -0800) > > are available in the git repository at: > > git://kernel.ubuntu.com/cmagina/trusty-xgene.git lp1404335 > > for you to fetch changes up to 00032765b9a95eb12852c924979b307c27a2ec42: > > arm64: Fix deadlock scenario with smp_send_stop() (2014-12-19 12:39:45 -0500) > > ---------------------------------------------------------------- > Arun KS (2): > arm64: Fix machine_shutdown() definition > arm64: Fix deadlock scenario with smp_send_stop() > > arch/arm64/kernel/process.c | 45 +++++++++++++++++++++++++++++++++++++-------- > 1 file changed, 37 insertions(+), 8 deletions(-) > > Thank you, commit 00032765b9a95eb12852c924979b307c27a2ec42 Author: Arun KS <arunks.linux@gmail.com> Date: Wed May 7 02:41:23 2014 +0100 arm64: Fix deadlock scenario with smp_send_stop() This first one, seems to have needed backporting because we have not applied the following to remove fiq support: commit f864b61ee49bbf3faf9a10b9770c719536328d01 Author: Nicolas Pitre <nicolas.pitre@linaro.org> Date: Wed Jan 29 18:00:45 2014 +0000 arm64: FIQs are unused I would think we either want that one, or you want to leave the following line in in your backport: - local_fiq_disable(); The other patch looks fine. -apw