[PATCH 0/2] m68k RTC fixes

[PATCH 0/2] m68k RTC fixes

[Geert Uytterhoeven]

	Hi Arnd, Alexandre,

"[PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of
asm-generic/rtc.h" of Arnd's series "[PATCH v3 00/16] genrtc removal"
caused two new build failures on m68k:

bvme6000_defconfig:

    In file included from arch/m68k/bvme6000/rtc.c:19:
    include/linux/mc146818rtc.h: In function ‘mc146818_is_updating’:
    include/linux/mc146818rtc.h:138: error: implicit declaration of function ‘CMOS_READ’
    include/linux/mc146818rtc.h: In function ‘mc146818_get_time’:
    include/linux/mc146818rtc.h:189: error: ‘RTC_ALWAYS_BCD’ undeclared (first use in this function)
    include/linux/mc146818rtc.h:189: error: (Each undeclared identifier is reported only once
    include/linux/mc146818rtc.h:189: error: for each function it appears in.)
    include/linux/mc146818rtc.h: In function ‘mc146818_set_time’:
    include/linux/mc146818rtc.h:279: error: ‘RTC_ALWAYS_BCD’ undeclared (first use in this function)
    include/linux/mc146818rtc.h:290: error: implicit declaration of function ‘CMOS_WRITE’


mvme16x_defconfig:

    In file included from arch/m68k/mvme16x/rtc.c:18:
    include/linux/mc146818rtc.h: In function ‘mc146818_is_updating’:
    include/linux/mc146818rtc.h:138: error: implicit declaration of function ‘CMOS_READ’
    include/linux/mc146818rtc.h: In function ‘mc146818_get_time’:
    include/linux/mc146818rtc.h:189: error: ‘RTC_ALWAYS_BCD’ undeclared (first use in this function)
    include/linux/mc146818rtc.h:189: error: (Each undeclared identifier is reported only once
    include/linux/mc146818rtc.h:189: error: for each function it appears in.)
    include/linux/mc146818rtc.h: In function ‘mc146818_set_time’:
    include/linux/mc146818rtc.h:279: error: ‘RTC_ALWAYS_BCD’ undeclared (first use in this function)
    include/linux/mc146818rtc.h:290: error: implicit declaration of function ‘CMOS_WRITE’

These do not show up with a multi-platform config including Atari
support, as arch/m68k/include/asm/mc146818rtc.h provides a definition of
CMOS_READ() if CONFIG_ATARI=y.

Fortunately the fixes are simple: replace <linux/mc146818rtc.h> by
<linux/rtc.h>.  This is safe to apply to current upstream, too.

Queue strategy:
  1. These are queued together with Arnd's series,
  1. I queue them for v4.7 myself, but then the RTC tree must be mergest
     after the m68k tree,
  2. I queue them for v4.6.

As I currently don't have any m68k patches queued for v4.7, perhaps it's
easiest if these are included with Arnd's series?

Thanks!

Geert Uytterhoeven (2):
  m68k/bvme6000: Include generic <linux/rtc.h>
  m68k/mvme16x: Include generic <linux/rtc.h>

 arch/m68k/bvme6000/rtc.c | 2 +-
 arch/m68k/mvme16x/rtc.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
1.9.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

[PATCH 1/2] m68k/bvme6000: Include generic <linux/rtc.h>

[Geert Uytterhoeven]

The BVME6000 RTC driver doesn't use any MC146818-specific definitions,
hence include the generic <linux/rtc.h> instead of
<linux/mc146818rtc.h>.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
To avoid a build failure after "rtc: cmos: move mc146818rtc code out of
asm-generic/rtc.h".
---
 arch/m68k/bvme6000/rtc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/m68k/bvme6000/rtc.c b/arch/m68k/bvme6000/rtc.c
index cf12a17dc289c5f9..f7984f44ff0f8072 100644
--- a/arch/m68k/bvme6000/rtc.c
+++ b/arch/m68k/bvme6000/rtc.c
@@ -15,7 +15,7 @@
 #include <linux/init.h>
 #include <linux/poll.h>
 #include <linux/module.h>
-#include <linux/mc146818rtc.h>	/* For struct rtc_time and ioctls, etc */
+#include <linux/rtc.h>	/* For struct rtc_time and ioctls, etc */
 #include <linux/bcd.h>
 #include <asm/bvme6000hw.h>
 
-- 
1.9.1

[PATCH 2/2] m68k/mvme16x: Include generic <linux/rtc.h>

[Geert Uytterhoeven]

The MVME16x RTC driver doesn't use any MC146818-specific definitions,
hence include the generic <linux/rtc.h> instead of
<linux/mc146818rtc.h>.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
To avoid a build failure after "rtc: cmos: move mc146818rtc code out of
asm-generic/rtc.h".
---
 arch/m68k/mvme16x/rtc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c
index 1755e2f7137d89ad..1cdc732681885e9a 100644
--- a/arch/m68k/mvme16x/rtc.c
+++ b/arch/m68k/mvme16x/rtc.c
@@ -14,7 +14,7 @@
 #include <linux/fcntl.h>
 #include <linux/init.h>
 #include <linux/poll.h>
-#include <linux/mc146818rtc.h>	/* For struct rtc_time and ioctls, etc */
+#include <linux/rtc.h>	/* For struct rtc_time and ioctls, etc */
 #include <linux/bcd.h>
 #include <asm/mvme16xhw.h>
 
-- 
1.9.1

Re: [PATCH 0/2] m68k RTC fixes

[Alexandre Belloni]

On 02/05/2016 at 10:46:21 +0200, Geert Uytterhoeven wrote :
> 	Hi Arnd, Alexandre,
> 
> "[PATCH v3 02/16] rtc: cmos: move mc146818rtc code out of
> asm-generic/rtc.h" of Arnd's series "[PATCH v3 00/16] genrtc removal"
> caused two new build failures on m68k:
> 
> bvme6000_defconfig:
> 
>     In file included from arch/m68k/bvme6000/rtc.c:19:
>     include/linux/mc146818rtc.h: In function ‘mc146818_is_updating’:
>     include/linux/mc146818rtc.h:138: error: implicit declaration of function ‘CMOS_READ’
>     include/linux/mc146818rtc.h: In function ‘mc146818_get_time’:
>     include/linux/mc146818rtc.h:189: error: ‘RTC_ALWAYS_BCD’ undeclared (first use in this function)
>     include/linux/mc146818rtc.h:189: error: (Each undeclared identifier is reported only once
>     include/linux/mc146818rtc.h:189: error: for each function it appears in.)
>     include/linux/mc146818rtc.h: In function ‘mc146818_set_time’:
>     include/linux/mc146818rtc.h:279: error: ‘RTC_ALWAYS_BCD’ undeclared (first use in this function)
>     include/linux/mc146818rtc.h:290: error: implicit declaration of function ‘CMOS_WRITE’
> 
> 
> mvme16x_defconfig:
> 
>     In file included from arch/m68k/mvme16x/rtc.c:18:
>     include/linux/mc146818rtc.h: In function ‘mc146818_is_updating’:
>     include/linux/mc146818rtc.h:138: error: implicit declaration of function ‘CMOS_READ’
>     include/linux/mc146818rtc.h: In function ‘mc146818_get_time’:
>     include/linux/mc146818rtc.h:189: error: ‘RTC_ALWAYS_BCD’ undeclared (first use in this function)
>     include/linux/mc146818rtc.h:189: error: (Each undeclared identifier is reported only once
>     include/linux/mc146818rtc.h:189: error: for each function it appears in.)
>     include/linux/mc146818rtc.h: In function ‘mc146818_set_time’:
>     include/linux/mc146818rtc.h:279: error: ‘RTC_ALWAYS_BCD’ undeclared (first use in this function)
>     include/linux/mc146818rtc.h:290: error: implicit declaration of function ‘CMOS_WRITE’
> 
> These do not show up with a multi-platform config including Atari
> support, as arch/m68k/include/asm/mc146818rtc.h provides a definition of
> CMOS_READ() if CONFIG_ATARI=y.
> 
> Fortunately the fixes are simple: replace <linux/mc146818rtc.h> by
> <linux/rtc.h>.  This is safe to apply to current upstream, too.
> 
> Queue strategy:
>   1. These are queued together with Arnd's series,
>   1. I queue them for v4.7 myself, but then the RTC tree must be mergest
>      after the m68k tree,
>   2. I queue them for v4.6.
> 
> As I currently don't have any m68k patches queued for v4.7, perhaps it's
> easiest if these are included with Arnd's series?
> 

I suggest you take them for 4.7 anyway. I don't think I am confident
enough to merge Arnd's series for 4.7. Also, I doubt I'll get many acks
from some architecture maintainers.

So, my plan is to apply it on top of 4.7-rc1 and let it sit in
linux-next for a while.

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [PATCH 0/2] m68k RTC fixes

[Arnd Bergmann]

On Tuesday 03 May 2016 15:40:34 Alexandre Belloni wrote:
> > Queue strategy:
> >   1. These are queued together with Arnd's series,
> >   1. I queue them for v4.7 myself, but then the RTC tree must be mergest
> >      after the m68k tree,
> >   2. I queue them for v4.6.
> > 
> > As I currently don't have any m68k patches queued for v4.7, perhaps it's
> > easiest if these are included with Arnd's series?
> > 
> 
> I suggest you take them for 4.7 anyway. I don't think I am confident
> enough to merge Arnd's series for 4.7. Also, I doubt I'll get many acks
> from some architecture maintainers.
> 
> So, my plan is to apply it on top of 4.7-rc1 and let it sit in
> linux-next for a while.
> 

Good idea. It's getting a bit late for 4.7 now, and there is nothing
urgent in my series.

	Arnd

Re: [PATCH 0/2] m68k RTC fixes

[Geert Uytterhoeven]

On Tue, May 3, 2016 at 3:49 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Tuesday 03 May 2016 15:40:34 Alexandre Belloni wrote:
>> > Queue strategy:
>> >   1. These are queued together with Arnd's series,
>> >   1. I queue them for v4.7 myself, but then the RTC tree must be mergest
>> >      after the m68k tree,
>> >   2. I queue them for v4.6.
>> >
>> > As I currently don't have any m68k patches queued for v4.7, perhaps it's
>> > easiest if these are included with Arnd's series?
>> >
>>
>> I suggest you take them for 4.7 anyway. I don't think I am confident
>> enough to merge Arnd's series for 4.7. Also, I doubt I'll get many acks
>> from some architecture maintainers.
>>
>> So, my plan is to apply it on top of 4.7-rc1 and let it sit in
>> linux-next for a while.
>
> Good idea. It's getting a bit late for 4.7 now, and there is nothing
> urgent in my series.

OK, I've applied the m68k preparatory fixes and pushed them out.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds