On Tue, 28 Jul 2015 22:05:49 +0200 "Luis R. Rodriguez" <mcgrof@xxxxxxxx> wrote: > I got a notice from Ingo on July 21 that one of my patches, "x86/mm, > asm-generic: Add IOMMU ioremap_uc() variant default" was merged into tip. It > was merged a long with other patches, for example: > > http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/drivers/video/fbdev/aty/atyfb_base.c?id=3cc2dac5be3f23414a4efdee0b26d79bed297cac > > I wrote this patch after Boris had my atyfb series bake on his tree > as his tree receives 0-day tests. Then this patch for example makes use of > ioremap_uc(): > > "drivers/video/fbdev/atyfb: Replace MTRR UC hole with strong UC" > > I noticed though that on top there's a revert of that same patch: > > http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/drivers/video/fbdev/aty/atyfb_base.c?id=4c090fb7209d523ef4cedb354192a190edd0d166 > > Revert "drivers/video/fbdev/atyfb: Replace MTRR UC hole with strong UC" akpm-base > This reverts commit 3cc2dac5be3f23414a4efdee0b26d79bed297cac. Stephen did this while preparing the linux-next release. Note that he reverted it "for today". Begin forwarded message: Date: Tue, 28 Jul 2015 15:33:03 +1000 From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> To: Thomas Gleixner <tglx@xxxxxxxxxxxxx>, Ingo Molnar <mingo@xxxxxxx>, "H. Peter Anvin" <hpa@xxxxxxxxx>, Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: linux-next@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, "Luis R. Rodriguez" <mcgrof@xxxxxxxx> Subject: linux-next: build failure after merge of the tip tree Hi all, After merging the tip tree, today's linux-next build (powerpc allyesconfig) failed like this: drivers/video/fbdev/aty/atyfb_base.c: In function 'atyfb_setup_generic': drivers/video/fbdev/aty/atyfb_base.c:3447:2: error: implicit declaration of function 'ioremap_uc' [-Werror=implicit-function-declaration] par->ati_regbase = ioremap_uc(info->fix.mmio_start, 0x1000); ^ drivers/video/fbdev/aty/atyfb_base.c:3447:19: warning: assignment makes pointer from integer without a cast par->ati_regbase = ioremap_uc(info->fix.mmio_start, 0x1000); ^ Caused by commits 3cc2dac5be3f ("drivers/video/fbdev/atyfb: Replace MTRR UC hole with strong UC") 8c7ea50c010b ("x86/mm, asm-generic: Add IOMMU ioremap_uc() variant default") The latter defines ioremap_uc() for x86 and those architectures that use asm-generic/io.h - which is not all of them :-( . The former commit then uses ioremap_uc(). I have reverted commit 3cc2dac5be3f (and 7d89a3cb159a that follows it) for today. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
