From: Mikulas Patocka Date: Tue, 2 Jan 2018 18:59:54 +0000 (-0500) Subject: alpha: fix reboot on Avanti platform X-Git-Tag: v4.16-rc1~92^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55fc633c41a08ce9244ff5f528f420b16b1e04d6;p=thirdparty%2Fkernel%2Flinux.git alpha: fix reboot on Avanti platform We need to define NEED_SRM_SAVE_RESTORE on the Avanti, otherwise we get machine check exception when attempting to reboot the machine. Signed-off-by: Mikulas Patocka Cc: stable@vger.kernel.org Signed-off-by: Matt Turner --- diff --git a/arch/alpha/kernel/pci_impl.h b/arch/alpha/kernel/pci_impl.h index 2e4cb74fdc416..18043af45e2b9 100644 --- a/arch/alpha/kernel/pci_impl.h +++ b/arch/alpha/kernel/pci_impl.h @@ -144,7 +144,8 @@ struct pci_iommu_arena }; #if defined(CONFIG_ALPHA_SRM) && \ - (defined(CONFIG_ALPHA_CIA) || defined(CONFIG_ALPHA_LCA)) + (defined(CONFIG_ALPHA_CIA) || defined(CONFIG_ALPHA_LCA) || \ + defined(CONFIG_ALPHA_AVANTI)) # define NEED_SRM_SAVE_RESTORE #else # undef NEED_SRM_SAVE_RESTORE