Commit 0a8eaa4f authored by Ingo Molnar's avatar Ingo Molnar

timers: fix itimer/many thread hang, fix #2

fix the UP build:

In file included from arch/x86/kernel/asm-offsets_32.c:9,
                 from arch/x86/kernel/asm-offsets.c:3:
include/linux/sched.h: In function ‘thread_group_cputime_clone_thread’:
include/linux/sched.h:2272: warning: no return statement in function returning non-void
include/linux/sched.h: In function ‘thread_group_cputime_account_user’:
include/linux/sched.h:2284: error: invalid type argument of ‘->’ (have ‘struct task_cputime’)
include/linux/sched.h:2284: error: invalid type argument of ‘->’ (have ‘struct task_cputime’)
include/linux/sched.h: In function ‘thread_group_cputime_account_system’:
include/linux/sched.h:2291: error: invalid type argument of ‘->’ (have ‘struct task_cputime’)
include/linux/sched.h:2291: error: invalid type argument of ‘->’ (have ‘struct task_cputime’)
include/linux/sched.h: In function ‘thread_group_cputime_account_exec_runtime’:
include/linux/sched.h:2298: error: invalid type argument of ‘->’ (have ‘struct task_cputime’)
distcc[14501] ERROR: compile arch/x86/kernel/asm-offsets.c on a/30 failed
make[1]: *** [arch/x86/kernel/asm-offsets.s] Error 1
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 430b5294
...@@ -2251,6 +2251,7 @@ static inline void thread_group_cputime_free(struct signal_struct *sig) ...@@ -2251,6 +2251,7 @@ static inline void thread_group_cputime_free(struct signal_struct *sig)
static inline int thread_group_cputime_clone_thread(struct task_struct *curr, static inline int thread_group_cputime_clone_thread(struct task_struct *curr,
struct task_struct *tsk) struct task_struct *tsk)
{ {
return 0;
} }
static inline void thread_group_cputime(struct task_struct *tsk, static inline void thread_group_cputime(struct task_struct *tsk,
...@@ -2263,21 +2264,21 @@ static inline void thread_group_cputime_account_user( ...@@ -2263,21 +2264,21 @@ static inline void thread_group_cputime_account_user(
struct thread_group_cputime *tgtimes, struct thread_group_cputime *tgtimes,
cputime_t cputime) cputime_t cputime)
{ {
tgtimes->totals->utime = cputime_add(tgtimes->totals->utime, cputime); tgtimes->totals.utime = cputime_add(tgtimes->totals.utime, cputime);
} }
static inline void thread_group_cputime_account_system( static inline void thread_group_cputime_account_system(
struct thread_group_cputime *tgtimes, struct thread_group_cputime *tgtimes,
cputime_t cputime) cputime_t cputime)
{ {
tgtimes->totals->stime = cputime_add(tgtimes->totals->stime, cputime); tgtimes->totals.stime = cputime_add(tgtimes->totals.stime, cputime);
} }
static inline void thread_group_cputime_account_exec_runtime( static inline void thread_group_cputime_account_exec_runtime(
struct thread_group_cputime *tgtimes, struct thread_group_cputime *tgtimes,
unsigned long long ns) unsigned long long ns)
{ {
tgtimes->totals->sum_exec_runtime += ns; tgtimes->totals.sum_exec_runtime += ns;
} }
#endif /* CONFIG_SMP */ #endif /* CONFIG_SMP */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment