linux-next: build failure after merge of the tip tree

Stephen Rothwell
2014-07-25T04:45:22Z

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

Hi all,

After merging the tip tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

arch/powerpc/kernel/time.c:743:6: error: conflicting types for 'update_vsyscall_old'
void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm,
^
In file included from arch/powerpc/kernel/time.c:77:0:
include/linux/timekeeper_internal.h:114:13: note: previous declaration of 'update_vsyscall_old' was here
extern void update_vsyscall_old(struct timespec *ts, struct timespec *wtm,
^

Caused by commit 4a0e637738f0 ("clocksource: Get rid of cycle_last").

I have used the tip tree from next-20140724 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]