[Xen-changelog] [xen stable-4.3] AMD Vi: fix HPET ID check

[patchbot@xxxxxxx]

commit e06f1c36d36260b7d82f8563f1a6f226160d4b23
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Oct 29 14:23:35 2015 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Oct 29 14:23:35 2015 +0100

    AMD Vi: fix HPET ID check
    
    Cherry picked from commit 2ca9fbd739 ("AMD IOMMU: allocate IRTE entries
    instead of using a static mapping") mainly to fix build with gcc 5.x.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/drivers/passthrough/amd/iommu_intr.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/xen/drivers/passthrough/amd/iommu_intr.c 
b/xen/drivers/passthrough/amd/iommu_intr.c
index 7943049..789f564 100644
--- a/xen/drivers/passthrough/amd/iommu_intr.c
+++ b/xen/drivers/passthrough/amd/iommu_intr.c
@@ -449,8 +449,7 @@ void* __init amd_iommu_alloc_intremap_table(void)
 
 int __init amd_setup_hpet_msi(struct msi_desc *msi_desc)
 {
-    if ( (!msi_desc->hpet_id != hpet_sbdf.id) ||
-         (hpet_sbdf.iommu == NULL) )
+    if ( msi_desc->hpet_id != hpet_sbdf.id || !hpet_sbdf.iommu )
     {
         AMD_IOMMU_DEBUG("Fail to setup HPET MSI remapping\n");
         return 1;
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.3

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog