Thomas, Dan took this series and updated patch 1/3 (and 2/3 as it contains the change from 1/3) to fix build warning on i386. Can you please replace patch 1/3 and 2/3 with the following version?
https://lkml.org/lkml/2015/7/19/365 (Patch 1/3) https://lkml.org/lkml/2015/7/19/366 (Patch 2/3) https://lkml.org/lkml/2015/7/19/367 (Patch 3/3) Thanks, -Toshi On Wed, 2015-07-22 at 08:25 -0700, tip-bot for Toshi Kani wrote: > Commit-ID: 1c9cf9b211030a454a84cbc1cb15b82d9aa49011 > Gitweb: > http://git.kernel.org/tip/1c9cf9b211030a454a84cbc1cb15b82d9aa49011 > Author: Toshi Kani <toshi.k...@hp.com> > AuthorDate: Thu, 16 Jul 2015 17:23:14 -0600 > Committer: Thomas Gleixner <t...@linutronix.de> > CommitDate: Wed, 22 Jul 2015 17:20:33 +0200 > > x86/mm: Move warning from __ioremap_check_ram() to the call site > > __ioremap_check_ram() has a WARN_ONCE() which is emitted when the > given pfn range is not RAM. The warning is bogus in two aspects: > > - it never triggers since walk_system_ram_range() only calls > __ioremap_check_ram() for RAM ranges. > > - the warning message is wrong as it says: "ioremap on RAM' after it > established that the pfn range is not RAM. > > Move the WARN_ONCE() to __ioremap_caller(), and update the message to > include the address range so we get an actual warning when something > tries to ioremap system RAM. > > [ tglx: Massaged changelog ] > > Signed-off-by: Toshi Kani <toshi.k...@hp.com> > Reviewed-by: Dan Williams <dan.j.willi...@intel.com> > Cc: Roland Dreier <rol...@purestorage.com> > Cc: Luis R. Rodriguez <mcg...@suse.com> > Cc: H. Peter Anvin <h...@zytor.com> > Cc: Ingo Molnar <mi...@redhat.com> > Cc: Borislav Petkov <b...@alien8.de> > Cc: linux...@kvack.org > Link: http://lkml.kernel.org/r/1437088996-28511-2-git-send-email > -toshi.k...@hp.com > Signed-off-by: Thomas Gleixner <t...@linutronix.de> > --- > arch/x86/mm/ioremap.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c > index cc5ccc4..fd3df0d 100644 > --- a/arch/x86/mm/ioremap.c > +++ b/arch/x86/mm/ioremap.c > @@ -63,8 +63,6 @@ static int __ioremap_check_ram(unsigned long start_pfn, > unsigned long nr_pages, > !PageReserved(pfn_to_page(start_pfn + i))) > return 1; > > - WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn); > - > return 0; > } > > @@ -131,8 +129,11 @@ static void __iomem > *__ioremap_caller(resource_size_t phys_addr, > pfn = phys_addr >> PAGE_SHIFT; > last_pfn = last_addr >> PAGE_SHIFT; > if (walk_system_ram_range(pfn, last_pfn - pfn + 1, NULL, > - __ioremap_check_ram) == 1) > + __ioremap_check_ram) == 1) { > + WARN_ONCE(1, "ioremap on RAM at 0x%llx - > 0x%llx\n", > + phys_addr, last_addr); > return NULL; > + } > } > /* > * Mappings have to be page-aligned -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
