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
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
