Merge commit 'v2.6.29-rc1' into perfcounters/core
Ingo Molnar [Sun, 11 Jan 2009 01:42:53 +0000 (02:42 +0100)]
Conflicts:
include/linux/kernel_stat.h

21 files changed:
1  2 
arch/x86/Kconfig
arch/x86/include/asm/atomic_32.h
arch/x86/include/asm/irq_vectors.h
arch/x86/kernel/apic.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/irq.c
arch/x86/kernel/irqinit_32.c
arch/x86/kernel/irqinit_64.c
drivers/acpi/processor_idle.c
drivers/char/sysrq.c
fs/exec.c
include/linux/init_task.h
include/linux/kernel_stat.h
include/linux/sched.h
include/linux/syscalls.h
init/Kconfig
kernel/Makefile
kernel/exit.c
kernel/fork.c
kernel/sched.c
kernel/sys.c

Simple merge
Simple merge
Simple merge
  #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>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/exec.c
Simple merge
Simple merge
@@@ -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 */
Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/Makefile
Simple merge
diff --cc kernel/exit.c
Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc kernel/sys.c
Simple merge