From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 11 Jan 2009 01:42:53 +0000 (+0100)
Subject: Merge commit 'v2.6.29-rc1' into perfcounters/core
X-Git-Tag: v3.12-rc1~14371^2~533
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=506c10f26c481b7f8ef27c1c79290f68989b2e9e;p=kernel%2Fkernel-generic.git

Merge commit 'v2.6.29-rc1' into perfcounters/core

Conflicts:
	include/linux/kernel_stat.h
---

506c10f26c481b7f8ef27c1c79290f68989b2e9e
diff --cc arch/x86/kernel/apic.c
index 6c83ac1,566a084..d2d17b8
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@@ -31,10 -31,11 +31,12 @@@
  #include <linux/dmi.h>
  #include <linux/dmar.h>
  #include <linux/ftrace.h>
+ #include <linux/smp.h>
+ #include <linux/nmi.h>
+ #include <linux/timex.h>
  
 +#include <asm/perf_counter.h>
  #include <asm/atomic.h>
- #include <asm/smp.h>
  #include <asm/mtrr.h>
  #include <asm/mpspec.h>
  #include <asm/desc.h>
diff --cc include/linux/kernel_stat.h
index 1b2e324,570d204..ecfa668
--- a/include/linux/kernel_stat.h
+++ b/include/linux/kernel_stat.h
@@@ -66,19 -78,14 +78,22 @@@ static inline unsigned int kstat_irqs(u
  	return sum;
  }
  
 +
 +/*
 + * Lock/unlock the current runqueue - to extract task statistics:
 + */
 +extern void curr_rq_lock_irq_save(unsigned long *flags);
 +extern void curr_rq_unlock_irq_restore(unsigned long *flags);
 +extern unsigned long long __task_delta_exec(struct task_struct *tsk, int update);
  extern unsigned long long task_delta_exec(struct task_struct *);
 +
- extern void account_user_time(struct task_struct *, cputime_t);
- extern void account_user_time_scaled(struct task_struct *, cputime_t);
- extern void account_system_time(struct task_struct *, int, cputime_t);
- extern void account_system_time_scaled(struct task_struct *, cputime_t);
- extern void account_steal_time(struct task_struct *, cputime_t);
+ extern void account_user_time(struct task_struct *, cputime_t, cputime_t);
+ extern void account_system_time(struct task_struct *, int, cputime_t, cputime_t);
+ extern void account_steal_time(cputime_t);
+ extern void account_idle_time(cputime_t);
+ 
+ extern void account_process_tick(struct task_struct *, int user);
+ extern void account_steal_ticks(unsigned long ticks);
+ extern void account_idle_ticks(unsigned long ticks);
  
  #endif /* _LINUX_KERNEL_STAT_H */