Re: [PATCH 0/4] cputime: Virtual cputime accounting small cleanups and consolidation v3

[Frederic Weisbecker <fweisbec@gmail.com>]

On Mon, Aug 20, 2012 at 10:40:12AM +0200, Ingo Molnar wrote:
> 
> * Frederic Weisbecker <fweisbec@gmail.com> wrote:
> 
> > Hi,
> > 
> > In this v3:
> > 
> > - Rebase against latest tip:sched/core
> > - Added acks from Martin
> > - Refined help text for the consolidated CONFIG_VIRT_CPU_ACCOUNTING option
> > in the 1st patch.
> > 
> > You can pull from:
> > 
> > git://github.com/fweisbec/linux-dynticks.git
> > 	virt-cputime-v3
> > 
> > Thanks.
> > 
> > Frederic Weisbecker (4):
> >   cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING
> >   sched: Move cputime code to its own file
> >   cputime: Consolidate vtime handling on context switch
> >   s390: Remove leftover account_tick_vtime() header
> > 
> >  arch/Kconfig                           |    3 +
> >  arch/ia64/Kconfig                      |   12 +-
> >  arch/ia64/include/asm/switch_to.h      |    8 -
> >  arch/ia64/kernel/time.c                |    4 +-
> >  arch/powerpc/include/asm/time.h        |    6 -
> >  arch/powerpc/kernel/process.c          |    3 -
> >  arch/powerpc/kernel/time.c             |    6 +
> >  arch/powerpc/platforms/Kconfig.cputype |   16 +-
> >  arch/s390/Kconfig                      |    5 +-
> >  arch/s390/include/asm/switch_to.h      |    4 -
> >  arch/s390/kernel/vtime.c               |    4 +-
> >  include/linux/kernel_stat.h            |    6 +
> >  init/Kconfig                           |   13 +
> >  kernel/sched/Makefile                  |    2 +-
> >  kernel/sched/core.c                    |  558 +-------------------------------
> >  kernel/sched/cputime.c                 |  503 ++++++++++++++++++++++++++++
> >  kernel/sched/sched.h                   |   63 ++++
> >  17 files changed, 606 insertions(+), 610 deletions(-)
> >  create mode 100644 kernel/sched/cputime.c
> 
> Hm, I'm getting build failures on x86:
> 
> kernel/sched/cputime.c:60:2: error: implicit declaration of 
> function ‘irq_time_write_begin’ 
> [-Werror=implicit-function-declaration]
> kernel/sched/cputime.c:72:2: error: implicit declaration of 
> function ‘irq_time_write_end’ 
> [-Werror=implicit-function-declaration]
> kernel/sched/cputime.c:274:2: error: implicit declaration of 
> function ‘static_key_false’ 
> [-Werror=implicit-function-declaration]
> 
> Config attached.
> 
> Thanks,
> 
> 	Ingo

Oops, sorry. Some misplaced #endif and a missing header inclusion.
So I just fixed that in the branch:

git://github.com/fweisbec/linux-dynticks.git
     virt-cputime-v4

The diff against the previous set is:

$ git diff virt-cputime-v3..virt-cputime-v4

diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
index ea9b4b6..372692b 100644
--- a/kernel/sched/cputime.c
+++ b/kernel/sched/cputime.c
@@ -2,6 +2,7 @@
 #include <linux/sched.h>
 #include <linux/tsacct_kern.h>
 #include <linux/kernel_stat.h>
+#include <linux/static_key.h>
 #include "sched.h"
 
 
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 62f9850..804c2e5 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1169,6 +1169,7 @@ enum rq_nohz_flag_bits {
 };
 
 #define nohz_flags(cpu)	(&cpu_rq(cpu)->nohz_flags)
+#endif
 
 #ifdef CONFIG_IRQ_TIME_ACCOUNTING
 
@@ -1219,4 +1220,3 @@ static inline u64 irq_time_read(int cpu)
 #endif /* CONFIG_64BIT */
 #endif /* CONFIG_IRQ_TIME_ACCOUNTING */
 
-#endif