On Mon, Jun 22, 2015 at 12:13:15AM -0400, Sasha Levin wrote: > From: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@xxxxxxx> > > This patch has been added to the 3.18 stable tree. If you have any > objections, please let us know. Yes, I have an objection. This patch fixes a comment! I really don't see how it would possibly fix something for which stable is used for. Or is there something below which I've missed?? > =============== > > [ Upstream commit b44915927ca88084a7292e4ddd4cf91036f365e1 ] > > The comment line regarding IOMMU_INIT and IOMMU_INIT_FINISH > macros is incorrect: > > "The standard vs the _FINISH differs in that the _FINISH variant > will continue detecting other IOMMUs in the call list..." > > It should be "..the *standard* variant will continue > detecting..." > > Fix that. Also, make it readable while at it. > > Signed-off-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@xxxxxxx> > Signed-off-by: Borislav Petkov <bp@xxxxxxx> > Cc: H. Peter Anvin <hpa@xxxxxxxxx> > Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > Cc: konrad.wilk@xxxxxxxxxx > Fixes: 6e9636693373 ("x86, iommu: Update header comments with appropriate naming") > Link: http://lkml.kernel.org/r/1428508017-5316-1-git-send-email-Aravind.Gopalakrishnan@xxxxxxx > Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> > Signed-off-by: Sasha Levin <sasha.levin@xxxxxxxxxx> > --- > arch/x86/include/asm/iommu_table.h | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/arch/x86/include/asm/iommu_table.h b/arch/x86/include/asm/iommu_table.h > index f42a047..e37d6b3 100644 > --- a/arch/x86/include/asm/iommu_table.h > +++ b/arch/x86/include/asm/iommu_table.h > @@ -79,11 +79,12 @@ struct iommu_table_entry { > * d). Similar to the 'init', except that this gets called from pci_iommu_init > * where we do have a memory allocator. > * > - * The standard vs the _FINISH differs in that the _FINISH variant will > - * continue detecting other IOMMUs in the call list after the > - * the detection routine returns a positive number. The _FINISH will > - * stop the execution chain. Both will still call the 'init' and > - * 'late_init' functions if they are set. > + * The standard IOMMU_INIT differs from the IOMMU_INIT_FINISH variant > + * in that the former will continue detecting other IOMMUs in the call > + * list after the detection routine returns a positive number, while the > + * latter will stop the execution chain upon first successful detection. > + * Both variants will still call the 'init' and 'late_init' functions if > + * they are set. > */ > #define IOMMU_INIT_FINISH(_detect, _depend, _init, _late_init) \ > __IOMMU_INIT(_detect, _depend, _init, _late_init, 1) > -- > 2.1.0 > -- Regards/Gruss, Boris. ECO tip #101: Trim your mails when you reply. -- -- To unsubscribe from this list: send the line "unsubscribe stable" in