From 17d82f31614b4df9c7c4dcb171f438156bdffd96 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Wed, 10 Dec 2008 20:01:45 +0100
Subject: [PATCH] --- yaml --- r: 125625 b: refs/heads/master c:
 edcb34da259c503a2ffd37e51a658672ba3bc7a2 h: refs/heads/master i:   125623:
 dc4306a37ebf70de85010d7bde7451a7f13f9ad1 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/kernel/amd_iommu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b83db9d077fb..7d3c387ff27b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c226f853091577e665ebc02c064af4834d8d4f28
+refs/heads/master: edcb34da259c503a2ffd37e51a658672ba3bc7a2
diff --git a/trunk/arch/x86/kernel/amd_iommu.c b/trunk/arch/x86/kernel/amd_iommu.c
index e410e97e5b0a..3011ea7a3f82 100644
--- a/trunk/arch/x86/kernel/amd_iommu.c
+++ b/trunk/arch/x86/kernel/amd_iommu.c
@@ -1543,7 +1543,7 @@ void prealloc_protection_domains(void)
 	u16 devid;
 
 	while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-		devid = (dev->bus->number << 8) | dev->devfn;
+		devid = calc_devid(dev->bus->number, dev->devfn);
 		if (devid > amd_iommu_last_bdf)
 			continue;
 		devid = amd_iommu_alias_table[devid];