Messages in this thread | | | Date | Mon, 23 May 2011 12:17:01 +0200 | From | "Roedel, Joerg" <> | Subject | Re: [PATCH 3/8] x86: Kill set but not used warning |
| |
On Fri, May 20, 2011 at 03:13:00PM -0400, Gustavo F. Padovan wrote: > Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Please provide a short and meaningful commit-msg.
> --- > arch/x86/kernel/amd_iommu.c | 5 +---- > 1 files changed, 1 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c > index 873e7e1..cd8cbeb5 100644 > --- a/arch/x86/kernel/amd_iommu.c > +++ b/arch/x86/kernel/amd_iommu.c > @@ -1538,13 +1538,11 @@ static void do_detach(struct device *dev) > { > struct iommu_dev_data *dev_data; > struct amd_iommu *iommu; > - struct pci_dev *pdev; > u16 devid; > > devid = get_device_id(dev); > iommu = amd_iommu_rlookup_table[devid]; > dev_data = get_dev_data(dev); > - pdev = to_pci_dev(dev); > > /* decrease reference counters */ > dev_data->domain->dev_iommu[iommu->index] -= 1;
This is already gone upstream.
> @@ -1703,10 +1701,9 @@ static struct protection_domain *domain_for_device(struct device *dev) > struct protection_domain *dom; > struct iommu_dev_data *dev_data, *alias_data; > unsigned long flags; > - u16 devid, alias; > + u16 devid; > > devid = get_device_id(dev); > - alias = amd_iommu_alias_table[devid]; > dev_data = get_dev_data(dev); > alias_data = get_dev_data(dev_data->alias); > if (!alias_data)
This is still there. Can you please rebase this patch against linus/master and send again?
Thanks,
Joerg
| |