---

yaml --- r: 356407 b: refs/heads/master c: a1dabad h: refs/heads/master i: 356405: 561afee 356403: fabeb8b 356399: 973d2c7 v: v3
git-mirror · Feb 8, 2013 · 60a4552 · 60a4552
1 parent c827f51
commit 60a4552
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 174ea471c395d70ee0c839ad59ca49f3b702de58
+refs/heads/master: a1dabadebb5731a6222bd6073e2770f0d0d13b73
diff --git a/trunk/arch/powerpc/platforms/pseries/iommu.c b/trunk/arch/powerpc/platforms/pseries/iommu.c
@@ -884,7 +884,7 @@ static int create_ddw(struct pci_dev *dev, const u32 *ddw_avail,
 }
 
 static void restore_default_window(struct pci_dev *dev,
-				u32 ddw_restore_token, unsigned long liobn)
+					u32 ddw_restore_token)
 {
 	struct eeh_dev *edev;
 	u32 cfg_addr;
@@ -1100,7 +1100,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)
 
 out_restore_window:
 	if (ddw_restore_token)
-		restore_default_window(dev, ddw_restore_token, liobn);
+		restore_default_window(dev, ddw_restore_token);
 
 out_unlock:
 	mutex_unlock(&direct_window_init_mutex);