diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2018-01-02 13:59:54 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-06-16 22:21:56 +0100 |
| commit | 483ff7c7dc52f49bcc4ca7ff22b8819093f159b2 (patch) | |
| tree | d3453a844abac8755c33b1c8ce50222cfc1d14e3 /arch | |
| parent | 88a25f03d3d99c0eb6eedab5d1c142f4289d2059 (diff) | |
| download | linux-stable-483ff7c7dc52f49bcc4ca7ff22b8819093f159b2.tar.gz linux-stable-483ff7c7dc52f49bcc4ca7ff22b8819093f159b2.tar.bz2 linux-stable-483ff7c7dc52f49bcc4ca7ff22b8819093f159b2.zip | |
alpha: fix reboot on Avanti platform
commit 55fc633c41a08ce9244ff5f528f420b16b1e04d6 upstream.
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 <mpatocka@redhat.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/alpha/kernel/pci_impl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/alpha/kernel/pci_impl.h b/arch/alpha/kernel/pci_impl.h index 2b0ac429f5eb..412bb3c24f36 100644 --- a/arch/alpha/kernel/pci_impl.h +++ b/arch/alpha/kernel/pci_impl.h @@ -143,7 +143,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 |