On Mon, 19 Dec 2011 17:30:09 +0100 Ingo Molnar <mingo@xxxxxxx> wrote: > > * Martin Schwidefsky <schwidefsky@xxxxxxxxxx> wrote: > > > > That way your commits are preserved and the conflicts are > > > resolved. > > > > Just did that and pushed out the result on > > > > git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git cputime-tip > > Hm, this fails spectacularly on 32-bit x86: > > /home/mingo/tip/drivers/cpufreq/cpufreq_ondemand.c: In function 'get_cpu_idle_time_jiffy': > /home/mingo/tip/drivers/cpufreq/cpufreq_ondemand.c:137: error: expected ';' before ')' token > /home/mingo/tip/drivers/cpufreq/cpufreq_ondemand.c:137: error: expected statement before ')' token Arg, sorry. Once more with feeling. I've replaced cputime-tip with a version that survived "make allmodconfig; make" on x86-32, x86-64, powerpc and s390 (with JUMP_LABEL=n, there is another bug lurking). ia64, the third architecture with VIRT_CPU_ACCOUNTING=y, does not compile due to a cyclic dependency in asm-offsets.c vs sched.h. Now it only has to work .. -- blue skies, Martin. "Reality continues to ruin my life." - Calvin. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
