Patches contributed by Eötvös Lorand University
commit df051434f1dfc93ec2e1c1d186bb87cb3db9dcdf
Merge: 805194c35b91 c59765042f53
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Jan 11 13:03:08 2009 +0100
Merge commit 'v2.6.29-rc1' into sched/urgent
commit 93423b8665f43a0c7a006a1d5be048b99db56d32
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Jan 11 05:15:21 2009 +0100
smp_call_function_single(): be slightly less stupid, fix
Impact: build fix on Alpha
kernel/up.c: In function 'smp_call_function_single':
kernel/up.c:12: error: 'cpuid' undeclared (first use in this function)
kernel/up.c:12: error: (Each undeclared identifier is reported only once
kernel/up.c:12: error: for each function it appears in.)
The typo didnt show up on x86 because 'cpuid' happens to be a
function address as well ...
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/kernel/up.c b/kernel/up.c
index ce62cc9e9f71..c04b9dcfcebe 100644
--- a/kernel/up.c
+++ b/kernel/up.c
@@ -9,10 +9,12 @@
int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
int wait)
{
- WARN_ON(cpuid != 0);
+ WARN_ON(cpu != 0);
+
local_irq_disable();
(func)(info);
local_irq_enable();
+
return 0;
}
EXPORT_SYMBOL(smp_call_function_single);
commit 0a6d4e1dc9154c4376358663d74060d1e33d203e
Merge: c59765042f53 1563513d34ed
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Jan 11 04:58:49 2009 +0100
Merge branch 'sched/latest' of git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins/linux-2.6-hacks into sched/rt
commit e8b722f487589a1f60ca27adc695494f188d404e
Merge: 01d07820a0df c59765042f53
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Jan 11 04:45:50 2009 +0100
Merge commit 'v2.6.29-rc1' into irq/urgent
commit 99cd7074891f87c49660e3b2880564324a4733ac
Merge: e8a9cbf6ae62 c59765042f53
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Jan 11 03:43:52 2009 +0100
Merge commit 'v2.6.29-rc1' into tracing/urgent
commit abede81c4fb2e3b85d8760f25e3da39d2c69a134
Merge: c9d557c19f94 c59765042f53
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Jan 11 03:41:39 2009 +0100
Merge commit 'v2.6.29-rc1' into core/urgent
commit f45ac22ae2b8fc5b4c32d9b8d17ea419a8701d89
Merge: 79f3b3cb7a25 c59765042f53
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Jan 11 03:03:30 2009 +0100
Merge commit 'v2.6.29-rc1' into x86/urgent
commit c0d362a832ee70435fc4555a64f820893b1da0bd
Merge: 506c10f26c48 f78628374a13
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Jan 11 02:44:08 2009 +0100
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perfcounters into perfcounters/core
commit 506c10f26c481b7f8ef27c1c79290f68989b2e9e
Merge: e1df957670ae c59765042f53
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Jan 11 02:42:53 2009 +0100
Merge commit 'v2.6.29-rc1' into perfcounters/core
Conflicts:
include/linux/kernel_stat.h
diff --cc arch/x86/kernel/apic.c
index 6c83ac10e6d3,566a08466b19..d2d17b8d10f8
--- 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 1b2e3242497c,570d20413119..ecfa66817634
--- 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 */
commit 0811a433c61e85f895018239c4466a36311cd5de
Merge: c29903076529 3d14bdad4031
Author: Ingo Molnar <mingo@elte.hu>
Date: Sun Jan 11 00:51:06 2009 +0100
Merge branch 'linus' into core/iommu