[PATCH 0/2] m68k RTC fixes

Geert Uytterhoeven
2016-05-02T08:46:21Z

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