From 60a4552c2d6cbf78869453179e5fddba6bcdd14c Mon Sep 17 00:00:00 2001 From: Nishanth Aravamudan Date: Mon, 28 Jan 2013 16:02:46 +0000 Subject: [PATCH] --- yaml --- r: 356407 b: refs/heads/master c: a1dabadebb5731a6222bd6073e2770f0d0d13b73 h: refs/heads/master i: 356405: 561afeee7478851d95992ef74d4b4996ca663d59 356403: fabeb8b116b7b9a1597705a27e126173d79f5efb 356399: 973d2c7125fa9156e38814add5dd12c5d169d4f0 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pseries/iommu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e593276a5362..0c1974fb7768 100644 --- 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 index b4bb9e141149..a8e99f9c3b41 100644 --- 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);