tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'amd-iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent

Ingo Molnar 22a26e66 c7210e1f

+9 -4
+9 -4
arch/x86/kernel/amd_iommu_init.c
··· 472 472 if (iommu->evt_buf == NULL) 473 473 return NULL; 474 474 475 + iommu->evt_buf_size = EVT_BUFFER_SIZE; 476 + 475 477 return iommu->evt_buf; 476 478 } 477 479 ··· 693 691 694 692 devid = e->devid; 695 693 devid_to = e->ext >> 8; 694 + set_dev_entry_from_acpi(iommu, devid , e->flags, 0); 696 695 set_dev_entry_from_acpi(iommu, devid_to, e->flags, 0); 697 696 amd_iommu_alias_table[devid] = devid_to; 698 697 break; ··· 752 749 753 750 devid = e->devid; 754 751 for (dev_i = devid_start; dev_i <= devid; ++dev_i) { 755 - if (alias) 752 + if (alias) { 756 753 amd_iommu_alias_table[dev_i] = devid_to; 757 - set_dev_entry_from_acpi(iommu, 758 - amd_iommu_alias_table[dev_i], 759 - flags, ext_flags); 754 + set_dev_entry_from_acpi(iommu, 755 + devid_to, flags, ext_flags); 756 + } 757 + set_dev_entry_from_acpi(iommu, dev_i, 758 + flags, ext_flags); 760 759 } 761 760 break; 762 761 default: