On 05/19/2015 06:36 AM, tip-bot for Nicholas Mc Guire wrote: > Commit-ID: 0a227985d4a993a322ff72ecbaeee2611d624216 > Gitweb: http://git.kernel.org/tip/0a227985d4a993a322ff72ecbaeee2611d624216 > Author: Nicholas Mc Guire <hofrat@xxxxxxxxx> > AuthorDate: Mon, 18 May 2015 14:19:12 +0200 > Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > CommitDate: Tue, 19 May 2015 15:13:45 +0200 > > time: Move timeconst.h into include/generated > > kernel/time/timeconst.h is moved to include/generated/ and generated > by the top level Kbuild. This allows using timeconst.h in an earlier > build stage. > > Signed-off-by: Nicholas Mc Guire <hofrat@xxxxxxxxx> > Cc: Masahiro Yamada <yamada.m@xxxxxxxxxxxxxxxx> > Cc: Sam Ravnborg <sam@xxxxxxxxxxxx> > Cc: Joe Perches <joe@xxxxxxxxxxx> > Cc: John Stultz <john.stultz@xxxxxxxxxx> > Cc: Andrew Hunter <ahh@xxxxxxxxxx> > Cc: Paul Turner <pjt@xxxxxxxxxx> > Cc: Michal Marek <mmarek@xxxxxxx> > Link: http://lkml.kernel.org/r/1431951554-5563-1-git-send-email-hofrat@xxxxxxxxx > Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > --- This patch seems to cause kernel/time/time.c to always need to be recompiled and the vmlinux to be relinked even if nothing has changed. make V=2 shows CC kernel/time/time.o - due to: include/config/ > diff --git a/Kbuild b/Kbuild > index 6f0d82a..df99a5f 100644 > --- a/Kbuild > +++ b/Kbuild > @@ -2,8 +2,9 @@ > # Kbuild for top-level directory of the kernel > # This file takes care of the following: > # 1) Generate bounds.h > -# 2) Generate asm-offsets.h (may need bounds.h) > -# 3) Check for missing system calls > +# 2) Generate timeconst.h > +# 3) Generate asm-offsets.h (may need bounds.h and timeconst.h) > +# 4) Check for missing system calls > > # Default sed regexp - multiline due to syntax constraints > define sed-y > @@ -47,7 +48,26 @@ $(obj)/$(bounds-file): kernel/bounds.s FORCE > $(call filechk,offsets,__LINUX_BOUNDS_H__) > > ##### > -# 2) Generate asm-offsets.h > +# 2) Generate timeconst.h > + > +timeconst-file := include/generated/timeconst.h > + > +#always += $(timeconst-file) Is there a reason this is commented out instead of removed? > +targets += $(timeconst-file) > + > +quiet_cmd_gentimeconst = GEN $@ > +define cmd_gentimeconst > [...] > diff --git a/kernel/time/Makefile b/kernel/time/Makefile > index 01f0312..ffc4cc3 100644 > --- a/kernel/time/Makefile > +++ b/kernel/time/Makefile > @@ -13,19 +13,4 @@ obj-$(CONFIG_TIMER_STATS) += timer_stats.o > obj-$(CONFIG_DEBUG_FS) += timekeeping_debug.o > obj-$(CONFIG_TEST_UDELAY) += test_udelay.o > > -$(obj)/time.o: $(obj)/timeconst.h > - > -quiet_cmd_hzfile = HZFILE $@ > - cmd_hzfile = echo "hz=$(CONFIG_HZ)" > $@ > - > -targets += hz.bc > -$(obj)/hz.bc: $(objtree)/include/config/hz.h FORCE > - $(call if_changed,hzfile) > - > -quiet_cmd_bc = BC $@ > - cmd_bc = bc -q $(filter-out FORCE,$^) > $@ > - > -targets += timeconst.h > -$(obj)/timeconst.h: $(obj)/hz.bc $(src)/timeconst.bc FORCE > - $(call if_changed,bc) > - > +$(obj)/time.o: $(objtree)/include/config/ It looks like it has to recompile because of this dependency. Can't we just remove this line? -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|