From 8a20800be67f1955d0b640b87ffbc6694324b0c6 Mon Sep 17 00:00:00 2001
From: Neil Turton <nturton@solarflare.com>
Date: Thu, 14 May 2009 14:00:35 +0100
Subject: [PATCH] --- yaml --- r: 145887 b: refs/heads/master c:
 421f909c803d1c397f6c66b75653f238696c39ee h: refs/heads/master i:   145885:
 18c54edcc3048c5ac3e6ae2c2e3db04f05999578   145883:
 110f2a4c5bcb1971bd3784cd855aae461ad78ec2   145879:
 2aa8d6875a4e458551d4f55406b6bf3596bdeda9   145871:
 d11a313d79ca6b6f07ab970c4356c12fe9c09302   145855:
 db7b2efbe4fae296dae2655d6ff0920b607fb931 v: v3

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

diff --git a/[refs] b/[refs]
index c3e00e31bde3..5913eb9b5880 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51
+refs/heads/master: 421f909c803d1c397f6c66b75653f238696c39ee
diff --git a/trunk/arch/x86/kernel/amd_iommu_init.c b/trunk/arch/x86/kernel/amd_iommu_init.c
index 8c0be0902dac..35fc9654c7a8 100644
--- a/trunk/arch/x86/kernel/amd_iommu_init.c
+++ b/trunk/arch/x86/kernel/amd_iommu_init.c
@@ -175,7 +175,7 @@ static inline void update_last_devid(u16 devid)
 static inline unsigned long tbl_size(int entry_size)
 {
 	unsigned shift = PAGE_SHIFT +
-			 get_order(amd_iommu_last_bdf * entry_size);
+			 get_order(((int)amd_iommu_last_bdf + 1) * entry_size);
 
 	return 1UL << shift;
 }