From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752903AbcFCWRC (ORCPT ); Fri, 3 Jun 2016 18:17:02 -0400 Received: from down.free-electrons.com ([37.187.137.238]:41797 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752419AbcFCWRA (ORCPT ); Fri, 3 Jun 2016 18:17:00 -0400 Date: Sat, 4 Jun 2016 00:16:57 +0200 From: Alexandre Belloni To: Guenter Roeck Cc: Arnd Bergmann , linux-kernel@vger.kernel.org, Jiri Kosina Subject: Re: Build failure in -next due to 'rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h' Message-ID: <20160603221657.GG4594@piout.net> References: <20160603005848.GA11147@roeck-us.net> <4034375.QyTnDIyzuW@wuerfel> <575197E7.5010201@roeck-us.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <575197E7.5010201@roeck-us.net> User-Agent: Mutt/1.6.0 (2016-04-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 03/06/2016 at 07:44:55 -0700, Guenter Roeck wrote : > On 06/03/2016 05:11 AM, Arnd Bergmann wrote: > > I have trouble reproducing this, but I think the problem here is that there > > are two definitions of CMOS_READ() in sparc, and we pick up the wrong one > > here: there is no 'rtc_port' variable outside of drivers/char/rtc.c, and we > > don't build that file any more on sparc32, so we probably want this patch: > > > > diff --git a/arch/sparc/include/asm/io_32.h b/arch/sparc/include/asm/io_32.h > > index 57f26c398dc9..4dd268a3a8b0 100644 > > --- a/arch/sparc/include/asm/io_32.h > > +++ b/arch/sparc/include/asm/io_32.h > > @@ -140,16 +140,6 @@ void ioport_unmap(void __iomem *); > > struct pci_dev; > > void pci_iounmap(struct pci_dev *dev, void __iomem *); > > > > - > > - > > -/* > > - * At the moment, we do not use CMOS_READ anywhere outside of rtc.c, > > - * so rtc_port is static in it. This should not change unless a new > > - * hardware pops up. > > - */ > > -#define RTC_PORT(x) (rtc_port + (x)) > > -#define RTC_ALWAYS_BCD 0 > > - > > static inline int sbus_can_dma_64bit(void) > > { > > return 0; /* actually, sparc_cpu_model==sun4d */ > > > > > > > > Can you check if this fixes the problem? > > > > Yes, it does. I did test builds with both sparc:allmodconfig and sparc64:allmodconfig > after applying above diff; both passed. > Arnd, do you mind sending a proper patch that I'll apply before 'rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h'? Else, I could squash it in but I think the former is cleaner. Thanks! -- Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com